Skip to content
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
merged 53 commits into from
Oct 26, 2023
Merged

Conversation

timmwille
Copy link
Member

@timmwille timmwille requested a review from walthierer October 23, 2023 20:18
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
Copy link
Member

@walthierer walthierer left a 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 :)

@timmwille timmwille self-assigned this Oct 25, 2023
@timmwille timmwille added bug Something isn't working feature New feature or request prio1 CSS/HTML JavaScript labels Oct 25, 2023
@timmwille timmwille marked this pull request as ready for review October 25, 2023 21:19
@timmwille timmwille marked this pull request as draft October 25, 2023 21:37
@timmwille
Copy link
Member Author

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
a77a029

@timmwille
Copy link
Member Author

this seems to hold the missing files: 2b236ea

saisilinus and others added 2 commits October 26, 2023 07:50
Revert "Revert "Merge branch 'development' into Create-field-for-"aut… to implement the lost content for modules and resources again
@timmwille timmwille marked this pull request as ready for review October 26, 2023 12:47
@timmwille timmwille merged commit 88bad6d into main Oct 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working CSS/HTML feature New feature or request JavaScript prio1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants