Merge branch 'feature/extra-lesson' into 'master'
Include extra lessons See merge request !51
No related branches found
No related tags found
Showing
- aleksis/apps/chronos/admin.py 14 additions, 0 deletionsaleksis/apps/chronos/admin.py
- aleksis/apps/chronos/migrations/0014_extra_lesson.py 53 additions, 0 deletionsaleksis/apps/chronos/migrations/0014_extra_lesson.py
- aleksis/apps/chronos/models.py 63 additions, 5 deletionsaleksis/apps/chronos/models.py
- aleksis/apps/chronos/templates/chronos/partials/elements.html 2 additions, 0 deletions...sis/apps/chronos/templates/chronos/partials/elements.html
- aleksis/apps/chronos/templates/chronos/partials/event.html 1 addition, 5 deletionsaleksis/apps/chronos/templates/chronos/partials/event.html
- aleksis/apps/chronos/templates/chronos/partials/extra_lesson.html 28 additions, 0 deletions...apps/chronos/templates/chronos/partials/extra_lesson.html
- aleksis/apps/chronos/templates/chronos/partials/lesson.html 4 additions, 17 deletionsaleksis/apps/chronos/templates/chronos/partials/lesson.html
- aleksis/apps/chronos/templates/chronos/partials/room.html 5 additions, 0 deletionsaleksis/apps/chronos/templates/chronos/partials/room.html
- aleksis/apps/chronos/templates/chronos/partials/subject.html 3 additions, 0 deletionsaleksis/apps/chronos/templates/chronos/partials/subject.html
- aleksis/apps/chronos/templates/chronos/partials/subject_colour.html 6 additions, 0 deletions...ps/chronos/templates/chronos/partials/subject_colour.html
- aleksis/apps/chronos/templates/chronos/partials/subs/room.html 2 additions, 14 deletions...is/apps/chronos/templates/chronos/partials/subs/room.html
- aleksis/apps/chronos/util/build.py 37 additions, 13 deletionsaleksis/apps/chronos/util/build.py
Loading
Please register or sign in to comment