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

30e640c9

Commit 30e640c9 authored 5 years ago by Nik | Klampfradler

Downloads
- Plain Diff

Merge branch 'feature/show-announcements-in-timetable-views' into 'master'

Show announcements in timetable views

Closes #63

See merge request !41

parents f899554d edfd5296

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

aleksis/apps/chronos/forms.py 6 additions, 0 deletions

aleksis/apps/chronos/forms.py
aleksis/apps/chronos/model_extensions.py 12 additions, 1 deletion

aleksis/apps/chronos/model_extensions.py
aleksis/apps/chronos/templates/chronos/my_timetable.html 1 addition, 1 deletion

aleksis/apps/chronos/templates/chronos/my_timetable.html
aleksis/apps/chronos/templates/chronos/partials/hints/substitutions.html 0 additions, 27 deletions

...ronos/templates/chronos/partials/hints/substitutions.html
aleksis/apps/chronos/templates/chronos/partials/hints/substitutions_print.html 0 additions, 16 deletions

...templates/chronos/partials/hints/substitutions_print.html
aleksis/apps/chronos/templates/chronos/partials/hints/timetable.html 0 additions, 63 deletions

...s/chronos/templates/chronos/partials/hints/timetable.html
aleksis/apps/chronos/templates/chronos/substitutions.html 1 addition, 1 deletion

aleksis/apps/chronos/templates/chronos/substitutions.html
aleksis/apps/chronos/templates/chronos/substitutions_print.html 1 addition, 1 deletion

...s/apps/chronos/templates/chronos/substitutions_print.html
aleksis/apps/chronos/templates/chronos/timetable.html 1 addition, 1 deletion

aleksis/apps/chronos/templates/chronos/timetable.html
aleksis/apps/chronos/views.py 9 additions, 1 deletion

aleksis/apps/chronos/views.py

with 31 additions and 112 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