Merge branch 'master' into 73-add-rules-and-permissions
# Conflicts: # aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html # aleksis/apps/alsijil/views.py
No related branches found
No related tags found
Showing
- aleksis/apps/alsijil/forms.py 20 additions, 9 deletionsaleksis/apps/alsijil/forms.py
- aleksis/apps/alsijil/menus.py 6 additions, 0 deletionsaleksis/apps/alsijil/menus.py
- aleksis/apps/alsijil/migrations/0002_excuse_type.py 73 additions, 0 deletionsaleksis/apps/alsijil/migrations/0002_excuse_type.py
- aleksis/apps/alsijil/migrations/0003_group_notes.py 18 additions, 0 deletionsaleksis/apps/alsijil/migrations/0003_group_notes.py
- aleksis/apps/alsijil/model_extensions.py 3 additions, 2 deletionsaleksis/apps/alsijil/model_extensions.py
- aleksis/apps/alsijil/models.py 39 additions, 2 deletionsaleksis/apps/alsijil/models.py
- aleksis/apps/alsijil/static/css/alsijil/full_register.css 2 additions, 2 deletionsaleksis/apps/alsijil/static/css/alsijil/full_register.css
- aleksis/apps/alsijil/tables.py 20 additions, 0 deletionsaleksis/apps/alsijil/tables.py
- aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html 30 additions, 11 deletions...apps/alsijil/templates/alsijil/class_register/lesson.html
- aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html 7 additions, 7 deletions...s/alsijil/templates/alsijil/class_register/week_view.html
- aleksis/apps/alsijil/templates/alsijil/excuse_type/create.html 18 additions, 0 deletions...is/apps/alsijil/templates/alsijil/excuse_type/create.html
- aleksis/apps/alsijil/templates/alsijil/excuse_type/edit.html 17 additions, 0 deletionsaleksis/apps/alsijil/templates/alsijil/excuse_type/edit.html
- aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html 20 additions, 0 deletionsaleksis/apps/alsijil/templates/alsijil/excuse_type/list.html
- aleksis/apps/alsijil/templates/alsijil/excuse_type/warning.html 10 additions, 0 deletions...s/apps/alsijil/templates/alsijil/excuse_type/warning.html
- aleksis/apps/alsijil/templates/alsijil/partials/absences.html 1 addition, 1 deletion...sis/apps/alsijil/templates/alsijil/partials/absences.html
- aleksis/apps/alsijil/templates/alsijil/print/full_register.html 88 additions, 25 deletions...s/apps/alsijil/templates/alsijil/print/full_register.html
- aleksis/apps/alsijil/urls.py 16 additions, 0 deletionsaleksis/apps/alsijil/urls.py
- aleksis/apps/alsijil/views.py 113 additions, 15 deletionsaleksis/apps/alsijil/views.py
- poetry.lock 118 additions, 117 deletionspoetry.lock
- pyproject.toml 1 addition, 1 deletionpyproject.toml
Loading
Please register or sign in to comment