Merge branch 'master' into 65-add-week-select-to-week-view
# Conflicts: # aleksis/apps/alsijil/views.py
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- aleksis/apps/alsijil/forms.py 6 additions, 6 deletionsaleksis/apps/alsijil/forms.py
- aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po 354 additions, 167 deletionsaleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
- aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po 449 additions, 222 deletionsaleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
- aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po 476 additions, 207 deletionsaleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
- aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po 375 additions, 175 deletionsaleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
- aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po 353 additions, 165 deletionsaleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
- aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po 353 additions, 165 deletionsaleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
- aleksis/apps/alsijil/menus.py 5 additions, 5 deletionsaleksis/apps/alsijil/menus.py
- aleksis/apps/alsijil/migrations/0003_extra_mark.py 72 additions, 0 deletionsaleksis/apps/alsijil/migrations/0003_extra_mark.py
- aleksis/apps/alsijil/migrations/0004_group_notes.py 20 additions, 0 deletionsaleksis/apps/alsijil/migrations/0004_group_notes.py
- aleksis/apps/alsijil/migrations/0005_groups_of_person.py 33 additions, 0 deletionsaleksis/apps/alsijil/migrations/0005_groups_of_person.py
- aleksis/apps/alsijil/migrations/0006_delete_personal_notes_filter.py 14 additions, 0 deletions...s/alsijil/migrations/0006_delete_personal_notes_filter.py
- aleksis/apps/alsijil/model_extensions.py 19 additions, 2 deletionsaleksis/apps/alsijil/model_extensions.py
- aleksis/apps/alsijil/models.py 25 additions, 17 deletionsaleksis/apps/alsijil/models.py
- aleksis/apps/alsijil/preferences.py 16 additions, 0 deletionsaleksis/apps/alsijil/preferences.py
- aleksis/apps/alsijil/static/css/alsijil/lesson.css 8 additions, 0 deletionsaleksis/apps/alsijil/static/css/alsijil/lesson.css
- aleksis/apps/alsijil/tables.py 12 additions, 7 deletionsaleksis/apps/alsijil/tables.py
- aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html 127 additions, 82 deletions...apps/alsijil/templates/alsijil/class_register/lesson.html
- aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html 22 additions, 1 deletion...s/alsijil/templates/alsijil/class_register/week_view.html
Loading
Please register or sign in to comment