Merge branch 'master' into 208-global-search
Showing
- .gitlab-ci.yml 2 additions, 0 deletions.gitlab-ci.yml
- .gitmodules 0 additions, 4 deletions.gitmodules
- Dockerfile 32 additions, 9 deletionsDockerfile
- aleksis/core/forms.py 41 additions, 7 deletionsaleksis/core/forms.py
- aleksis/core/locale/de_DE/LC_MESSAGES/django.po 225 additions, 248 deletionsaleksis/core/locale/de_DE/LC_MESSAGES/django.po
- aleksis/core/locale/la/LC_MESSAGES/django.po 42 additions, 41 deletionsaleksis/core/locale/la/LC_MESSAGES/django.po
- aleksis/core/menus.py 7 additions, 1 deletionaleksis/core/menus.py
- aleksis/core/migrations/0021_person_description_field.py 18 additions, 0 deletionsaleksis/core/migrations/0021_person_description_field.py
- aleksis/core/migrations/0022_group_types.py 33 additions, 0 deletionsaleksis/core/migrations/0022_group_types.py
- aleksis/core/mixins.py 2 additions, 2 deletionsaleksis/core/mixins.py
- aleksis/core/models.py 50 additions, 3 deletionsaleksis/core/models.py
- aleksis/core/settings.py 14 additions, 1 deletionaleksis/core/settings.py
- aleksis/core/static/js/main.js 12 additions, 0 deletionsaleksis/core/static/js/main.js
- aleksis/core/static/style.scss 21 additions, 0 deletionsaleksis/core/static/style.scss
- aleksis/core/tasks.py 18 additions, 0 deletionsaleksis/core/tasks.py
- aleksis/core/templates/components/text_collapsible.html 13 additions, 0 deletionsaleksis/core/templates/components/text_collapsible.html
- aleksis/core/util/core_helpers.py 4 additions, 3 deletionsaleksis/core/util/core_helpers.py
- aleksis/core/util/notifications.py 0 additions, 1 deletionaleksis/core/util/notifications.py
- aleksis/core/views.py 7 additions, 4 deletionsaleksis/core/views.py
- apps/official/AlekSIS-App-Alsijil 1 addition, 1 deletionapps/official/AlekSIS-App-Alsijil
Loading
Please register or sign in to comment