Merge branch 'master' into 83-review-permissions
Showing
- .github/PULL_REQUEST_TEMPLATE.md 11 additions, 0 deletions.github/PULL_REQUEST_TEMPLATE.md
- .gitlab-ci.yml 9 additions, 3 deletions.gitlab-ci.yml
- aleksis/apps/chronos/managers.py 58 additions, 19 deletionsaleksis/apps/chronos/managers.py
- aleksis/apps/chronos/mixins.py 7 additions, 1 deletionaleksis/apps/chronos/mixins.py
- aleksis/apps/chronos/model_extensions.py 11 additions, 1 deletionaleksis/apps/chronos/model_extensions.py
- aleksis/apps/chronos/models.py 110 additions, 20 deletionsaleksis/apps/chronos/models.py
- aleksis/apps/chronos/templates/chronos/my_timetable.html 27 additions, 20 deletionsaleksis/apps/chronos/templates/chronos/my_timetable.html
- aleksis/apps/chronos/templates/chronos/partials/elements.html 3 additions, 3 deletions...sis/apps/chronos/templates/chronos/partials/elements.html
- aleksis/apps/chronos/templates/chronos/partials/lesson.html 1 addition, 3 deletionsaleksis/apps/chronos/templates/chronos/partials/lesson.html
- aleksis/apps/chronos/templates/chronos/partials/supervision.html 1 addition, 1 deletion.../apps/chronos/templates/chronos/partials/supervision.html
- aleksis/apps/chronos/templates/chronos/partials/today.html 2 additions, 0 deletionsaleksis/apps/chronos/templates/chronos/partials/today.html
- aleksis/apps/chronos/templates/chronos/partials/week_timetable.html 71 additions, 0 deletions...ps/chronos/templates/chronos/partials/week_timetable.html
- aleksis/apps/chronos/templates/chronos/timetable.html 1 addition, 66 deletionsaleksis/apps/chronos/templates/chronos/timetable.html
- aleksis/apps/chronos/util/build.py 43 additions, 25 deletionsaleksis/apps/chronos/util/build.py
- aleksis/apps/chronos/views.py 15 additions, 1 deletionaleksis/apps/chronos/views.py
- poetry.lock 1021 additions, 399 deletionspoetry.lock
- pyproject.toml 1 addition, 1 deletionpyproject.toml
- tox.ini 5 additions, 2 deletionstox.ini
Loading
Please register or sign in to comment