forked from ASKtraining/Training
-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Development changes of the code ready for deployment #97
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
timmwille
commented
Oct 23, 2023
- fixing the time and day break edit function fix: time edit for multiple breaks #81
- fix time duration Time break duration #82
- display time adoption if a resource has duration of 0 minutes, don't show minutes at all on the description/right of the resource #85
- Add field "trainer's notes" #89 new feature for content preparation
- Create field for "authors" #92 new feature for credits
…it-function fix: time edit for multiple breaks
Time break duration
…ed-duration Update/calculate manually changed duration
…dit-function fix: time edit for multiple breaks
Time break duration unlimited
if a resource has duration of 0 minutes, don't show minutes at all on the description/right of the resource
…ged-duration Update/calculate manually changed duration
walthierer
approved these changes
Oct 24, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as far as i can tell, everything looks super nice :)
Add field "trainer's notes"
This reverts commit c822d2a.
…linus/ASKnet-training into Create-field-for-"authors"
Create field for "authors"
…reaks-again fix: time break standard display
Damn, missed that one by reverting to fix merge conflicts it seems to have deleted the updates coming from the development branch, need to look at this again tomorrow |
this seems to hold the missing files: 2b236ea |
…hors""" This reverts commit a77a029.
Revert "Revert "Merge branch 'development' into Create-field-for-"aut… to implement the lost content for modules and resources again
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.