Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-App-Chronos
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

6817a61f

Verified Commit 6817a61f authored 4 years ago by Jonathan Weth

Downloads
- Plain Diff

Merge branch 'master' into 58-models-for-advanced-features-from-schoolapps-imported-from-untis

parents d9e4b432 d8cf45d2

No related branches found

No related tags found

1 merge request!39Resolve "Models for advanced features from SchoolApps (imported from Untis)"

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

aleksis/apps/chronos/models.py 1 addition, 1 deletion

aleksis/apps/chronos/models.py
aleksis/apps/chronos/templates/chronos/timetable.html 10 additions, 7 deletions

aleksis/apps/chronos/templates/chronos/timetable.html
aleksis/apps/chronos/views.py 15 additions, 6 deletions

aleksis/apps/chronos/views.py

with 26 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment