Merge branch 'master' into feature/smart-plan-dashboard-widget
# Conflicts: # aleksis/apps/chronos/views.py
No related branches found
No related tags found
This commit is part of merge request !36. Comments created here will be created in the context of that merge request.
Showing
- aleksis/apps/chronos/models.py 57 additions, 0 deletionsaleksis/apps/chronos/models.py
- aleksis/apps/chronos/settings.py 12 additions, 2 deletionsaleksis/apps/chronos/settings.py
- aleksis/apps/chronos/static/css/chronos/timetable.css 4 additions, 0 deletionsaleksis/apps/chronos/static/css/chronos/timetable.css
- aleksis/apps/chronos/templates/chronos/partials/headerbox.html 33 additions, 0 deletions...is/apps/chronos/templates/chronos/partials/headerbox.html
- aleksis/apps/chronos/templates/chronos/substitutions.html 1 addition, 16 deletionsaleksis/apps/chronos/templates/chronos/substitutions.html
- aleksis/apps/chronos/templates/chronos/substitutions_print.html 1 addition, 14 deletions...s/apps/chronos/templates/chronos/substitutions_print.html
- aleksis/apps/chronos/util/prev_next.py 0 additions, 48 deletionsaleksis/apps/chronos/util/prev_next.py
- aleksis/apps/chronos/views.py 16 additions, 14 deletionsaleksis/apps/chronos/views.py
Loading
Please register or sign in to comment