Merge remote-tracking branch 'remotes/origin/master' into 82-move-get_-_by_pk-fuctions-to-util
# Conflicts: # aleksis/apps/chronos/views.py
Showing
- aleksis/apps/chronos/admin.py 12 additions, 12 deletionsaleksis/apps/chronos/admin.py
- aleksis/apps/chronos/filters.py 0 additions, 16 deletionsaleksis/apps/chronos/filters.py
- aleksis/apps/chronos/forms.py 6 additions, 2 deletionsaleksis/apps/chronos/forms.py
- aleksis/apps/chronos/hints.py 0 additions, 56 deletionsaleksis/apps/chronos/hints.py
- aleksis/apps/chronos/managers.py 142 additions, 73 deletionsaleksis/apps/chronos/managers.py
- aleksis/apps/chronos/menus.py 16 additions, 4 deletionsaleksis/apps/chronos/menus.py
- aleksis/apps/chronos/migrations/0005_remove_school_related.py 34 additions, 50 deletions...sis/apps/chronos/migrations/0005_remove_school_related.py
- aleksis/apps/chronos/migrations/0006_extended_data.py 6 additions, 4 deletionsaleksis/apps/chronos/migrations/0006_extended_data.py
- aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py 435 additions, 161 deletions...pps/chronos/migrations/0007_advanced_models_from_untis.py
- aleksis/apps/chronos/migrations/0008_break_period.py 31 additions, 24 deletionsaleksis/apps/chronos/migrations/0008_break_period.py
- aleksis/apps/chronos/migrations/0009_extended_data.py 26 additions, 16 deletionsaleksis/apps/chronos/migrations/0009_extended_data.py
- aleksis/apps/chronos/migrations/0010_absence_reason_name.py 17 additions, 15 deletionsaleksis/apps/chronos/migrations/0010_absence_reason_name.py
- aleksis/apps/chronos/migrations/0011_absence_for_groups_and_rooms.py 30 additions, 15 deletions...s/chronos/migrations/0011_absence_for_groups_and_rooms.py
- aleksis/apps/chronos/migrations/0012_event_remove_absence_reason.py 2 additions, 5 deletions...ps/chronos/migrations/0012_event_remove_absence_reason.py
- aleksis/apps/chronos/migrations/0013_event_title_optional.py 6 additions, 4 deletionsaleksis/apps/chronos/migrations/0013_event_title_optional.py
- aleksis/apps/chronos/migrations/0014_extra_lesson.py 70 additions, 26 deletionsaleksis/apps/chronos/migrations/0014_extra_lesson.py
- aleksis/apps/chronos/migrations/0015_rename_abbrev_to_short_name.py 3 additions, 6 deletions...ps/chronos/migrations/0015_rename_abbrev_to_short_name.py
- aleksis/apps/chronos/migrations/0016_add_globalpermissions.py 23 additions, 6 deletions...sis/apps/chronos/migrations/0016_add_globalpermissions.py
- aleksis/apps/chronos/model_extensions.py 12 additions, 8 deletionsaleksis/apps/chronos/model_extensions.py
- aleksis/apps/chronos/models.py 209 additions, 104 deletionsaleksis/apps/chronos/models.py
Loading
Please register or sign in to comment