Merge branch 'master' into...
Merge branch 'master' into 115-person-overview-implement-multiple-selection-for-marking-absences-as-excused-or-for-deleting
No related branches found
No related tags found
Checking pipeline status
Showing
- README.rst 4 additions, 4 deletionsREADME.rst
- aleksis/apps/alsijil/__init__.py 0 additions, 2 deletionsaleksis/apps/alsijil/__init__.py
- aleksis/apps/alsijil/apps.py 2 additions, 2 deletionsaleksis/apps/alsijil/apps.py
- aleksis/apps/alsijil/migrations/0001_initial.py 8 additions, 9 deletionsaleksis/apps/alsijil/migrations/0001_initial.py
- aleksis/apps/alsijil/migrations/0002_excuse_type.py 2 additions, 3 deletionsaleksis/apps/alsijil/migrations/0002_excuse_type.py
- aleksis/apps/alsijil/migrations/0003_extra_mark.py 2 additions, 3 deletionsaleksis/apps/alsijil/migrations/0003_extra_mark.py
- aleksis/apps/alsijil/migrations/0008_global_permissions.py 1 addition, 1 deletionaleksis/apps/alsijil/migrations/0008_global_permissions.py
- aleksis/apps/alsijil/migrations/0009_group_roles.py 2 additions, 2 deletionsaleksis/apps/alsijil/migrations/0009_group_roles.py
- aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py 2 additions, 2 deletionsaleksis/apps/alsijil/migrations/0010_events_extra_lessons.py
- aleksis/apps/alsijil/models.py 6 additions, 7 deletionsaleksis/apps/alsijil/models.py
- aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html 2 additions, 2 deletions...apps/alsijil/templates/alsijil/class_register/lesson.html
- aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html 9 additions, 9 deletions...s/alsijil/templates/alsijil/class_register/week_view.html
- aleksis/apps/alsijil/util/alsijil_helpers.py 4 additions, 2 deletionsaleksis/apps/alsijil/util/alsijil_helpers.py
- aleksis/apps/alsijil/views.py 19 additions, 1 deletionaleksis/apps/alsijil/views.py
- poetry.lock 41 additions, 98 deletionspoetry.lock
Loading
Please register or sign in to comment