Skip to content
Snippets Groups Projects
Select Git revision
  • master default protected
  • renovate/intlify-eslint-plugin-vue-i18n-4.x
  • renovate/eslint-plugin-vue-10.x
  • adapt-to-caldav
  • renovate/eslint-9.x
  • renovate/eslint-config-prettier-10.x
  • 350-make-permission-checks-for-absences-and-personal-notes-list-on-statistics-page-efficient
  • 335-allow-access-to-other-groups-for-special-roles-like-school-management
  • renovate/stylelint-config-standard-37.x
  • 269-include-class-register-in-calendar-dialog
  • 330-make-days-more-distinguishable-in-coursebook
  • renovate/stylelint-16.x
  • release/4.0.0.dev9
  • 342-ordering-of-affected-lessons-in-register-absence-dialog-is-wrong
  • 324-graphqlerror-can-t-compare-offset-naive-and-offset-aware-datetimes
  • 340-disable-list-of-participations-button-during-documentation-save
  • 322-rename-newpersonalnote-to-personalnote
  • 333-kolego-absences-are-not-properly-taken-into-regard-when-creating-participation-statuses
  • 308-follow-up-from-resolve-add-absence-overview-page
  • deprecate-documentation-get-subject-method
  • 4.0.0.dev8 protected
  • 4.0.0.dev7 protected
  • 4.0.0.dev6 protected
  • 4.0.0.dev5 protected
  • 4.0.0.dev4 protected
  • 4.0.0.dev3 protected
  • 4.0.0.dev2 protected
  • 4.0.0.dev1 protected
  • 4.0.0.dev0 protected
  • 3.0.1 protected
  • 3.0 protected
  • 3.0b0 protected
  • 2.1.1 protected
  • 3.0.dev0 protected
  • 2.1 protected
  • 2.0.1 protected
  • 2.0 protected
  • 2.0rc7.post0 protected
  • 2.0rc7 protected
  • 2.0rc6 protected
40 results
Blame Permalink
  • Julian's avatar
    1124843e
    Merge branch 'master' into 260-add-personal-note-management-dialog-in-course-book · 1124843e
    Julian authored 
    # 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
    1124843e
    History
    Merge branch 'master' into 260-add-personal-note-management-dialog-in-course-book
    Julian authored 
    # 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