Merge branch 'master' into 25-roles-and-permissions
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- .gitmodules 0 additions, 4 deletions.gitmodules
- Dockerfile 7 additions, 1 deletionDockerfile
- aleksis/core/forms.py 1 addition, 1 deletionaleksis/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 1 addition, 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 7 additions, 0 deletionsaleksis/core/mixins.py
- aleksis/core/models.py 60 additions, 3 deletionsaleksis/core/models.py
- aleksis/core/search_indexes.py 10 additions, 0 deletionsaleksis/core/search_indexes.py
- aleksis/core/settings.py 46 additions, 1 deletionaleksis/core/settings.py
- aleksis/core/static/js/main.js 4 additions, 0 deletionsaleksis/core/static/js/main.js
- aleksis/core/static/js/search.js 121 additions, 0 deletionsaleksis/core/static/js/search.js
- aleksis/core/static/style.scss 107 additions, 3 deletionsaleksis/core/static/style.scss
- aleksis/core/static/theme.scss 1 addition, 1 deletionaleksis/core/static/theme.scss
- aleksis/core/tasks.py 18 additions, 0 deletionsaleksis/core/tasks.py
- aleksis/core/templates/core/base.html 12 additions, 0 deletionsaleksis/core/templates/core/base.html
- aleksis/core/templates/search/indexes/core/group_text.txt 2 additions, 0 deletionsaleksis/core/templates/search/indexes/core/group_text.txt
Loading
Please register or sign in to comment