Merge branch 'master' into 260-add-personal-note-management-dialog-in-course-book
# Conflicts: # aleksis/apps/alsijil/frontend/components/coursebook/Coursebook.vue # aleksis/apps/alsijil/frontend/components/coursebook/CoursebookDay.vue # aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue # aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsTrigger.vue # aleksis/apps/alsijil/frontend/components/coursebook/absences/participationStatus.graphql # aleksis/apps/alsijil/frontend/components/coursebook/coursebook.graphql # aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue # aleksis/apps/alsijil/frontend/messages/de.json # aleksis/apps/alsijil/models.py # aleksis/apps/alsijil/schema/__init__.py # aleksis/apps/alsijil/schema/documentation.py # aleksis/apps/alsijil/schema/participation_status.py
No related branches found
No related tags found
Checking pipeline status
Showing
- .prettierignore 2 additions, 0 deletions.prettierignore
- CHANGELOG.rst 9 additions, 6 deletionsCHANGELOG.rst
- aleksis/apps/alsijil/frontend/components/coursebook/Coursebook.vue 10 additions, 5 deletions...pps/alsijil/frontend/components/coursebook/Coursebook.vue
- aleksis/apps/alsijil/frontend/components/coursebook/CoursebookDay.vue 3 additions, 2 deletions.../alsijil/frontend/components/coursebook/CoursebookDay.vue
- aleksis/apps/alsijil/frontend/components/coursebook/CoursebookFilters.vue 10 additions, 4 deletions...ijil/frontend/components/coursebook/CoursebookFilters.vue
- aleksis/apps/alsijil/frontend/components/coursebook/CoursebookLoader.vue 2 additions, 2 deletions...sijil/frontend/components/coursebook/CoursebookLoader.vue
- aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue 47 additions, 47 deletions...d/components/coursebook/absences/ManageStudentsDialog.vue
- aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsTrigger.vue 0 additions, 2 deletions.../components/coursebook/absences/ManageStudentsTrigger.vue
- aleksis/apps/alsijil/frontend/components/coursebook/absences/participationStatus.graphql 3 additions, 0 deletions...omponents/coursebook/absences/participationStatus.graphql
- aleksis/apps/alsijil/frontend/components/coursebook/coursebook.graphql 17 additions, 4 deletions...alsijil/frontend/components/coursebook/coursebook.graphql
- aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue 2 additions, 2 deletions...components/coursebook/documentation/LessonInformation.vue
- aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue 51 additions, 25 deletions...ntend/components/coursebook/documentation/LessonNotes.vue
- aleksis/apps/alsijil/frontend/messages/de.json 63 additions, 59 deletionsaleksis/apps/alsijil/frontend/messages/de.json
- aleksis/apps/alsijil/frontend/messages/en.json 1 addition, 0 deletionsaleksis/apps/alsijil/frontend/messages/en.json
- aleksis/apps/alsijil/frontend/messages/ru.json 27 additions, 19 deletionsaleksis/apps/alsijil/frontend/messages/ru.json
- aleksis/apps/alsijil/frontend/messages/uk.json 26 additions, 18 deletionsaleksis/apps/alsijil/frontend/messages/uk.json
- aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po 388 additions, 271 deletionsaleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
- aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po 413 additions, 300 deletionsaleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
- aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po 435 additions, 284 deletionsaleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
- aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po 398 additions, 273 deletionsaleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
Loading
Please register or sign in to comment