Skip to content
Snippets Groups Projects
Select Git revision
  • renovate/aleksis-app-kolego-1.x
  • master default protected
  • check/update-tox-ini
  • renovate/aleksis-core-4.x
  • fix/delete-lesson-events
  • 70-fix-until-date-of-previous-term-if-importing-new-term
  • 74-update-for-current-changes-in-lesrooster
  • stable-3.0
  • release-3.0
  • release-2.3.2
  • 63-class-absences-lessons-with-multiple-classes-are-marked-as-cancelled-even-if-only-one-of-the
  • weblate
  • 58-support-student-group-field-of-lesson
  • 59-support-overlapping-periods
  • test-hhg
  • feature/vuejs
  • allow-30
  • 54-importing-lessons-fails-due-to-wrong-reg-ex
  • i10n-ru-ua
  • 49-import-should-respect-school_id
  • 3.0.1 protected
  • 3.0 protected
  • 3.0b0 protected
  • 2.3.2 protected
  • 2.3.1 protected
  • 2.3 protected
  • 2.2.1.dev0 protected
  • 2.2 protected
  • 2.2a0 protected
  • 2.1.4.dev0 protected
  • 2.1.3 protected
  • 2.1.2 protected
  • 2.1 protected
  • 2.1.dev2 protected
  • 2.1.dev1 protected
  • 2.1.dev0 protected
  • 2.0 protected
  • 2.0rc3 protected
  • 2.0rc2 protected
  • 2.0rc1 protected
40 results
Blame Permalink
  • Jonathan Weth's avatar
    2f5ae2a6
    Merge branch 'dev' into merge/dashboard-cache · 2f5ae2a6
    Jonathan Weth authored 
    # Conflicts:
#	.idea/misc.xml
#	requirements.txt
#	schoolapps/dashboard/urls.py
#	schoolapps/dashboard/views.py
#	schoolapps/schoolapps/settings.py
#	schoolapps/schoolapps/urls.py
#	schoolapps/templates/partials/header.html
#	schoolapps/timetable/views.py
    2f5ae2a6
    History
    Merge branch 'dev' into merge/dashboard-cache
    Jonathan Weth authored 
    # Conflicts:
#	.idea/misc.xml
#	requirements.txt
#	schoolapps/dashboard/urls.py
#	schoolapps/dashboard/views.py
#	schoolapps/schoolapps/settings.py
#	schoolapps/schoolapps/urls.py
#	schoolapps/templates/partials/header.html
#	schoolapps/timetable/views.py