Merge branch 'master' into selenium
No related tags found
Showing
- .gitlab-ci.yml 8 additions, 6 deletions.gitlab-ci.yml
- .gitmodules 0 additions, 20 deletions.gitmodules
- CODE_OF_CONDUCT.rst 0 additions, 144 deletionsCODE_OF_CONDUCT.rst
- CONTRIBUTING.rst 0 additions, 232 deletionsCONTRIBUTING.rst
- Dockerfile 0 additions, 97 deletionsDockerfile
- aleksis/core/apps.py 2 additions, 2 deletionsaleksis/core/apps.py
- aleksis/core/forms.py 45 additions, 9 deletionsaleksis/core/forms.py
- aleksis/core/migrations/0001_initial.py 2 additions, 3 deletionsaleksis/core/migrations/0001_initial.py
- aleksis/core/migrations/0004_add_permissions_for_group_stats.py 22 additions, 0 deletions...s/core/migrations/0004_add_permissions_for_group_stats.py
- aleksis/core/mixins.py 4 additions, 4 deletionsaleksis/core/mixins.py
- aleksis/core/models.py 31 additions, 12 deletionsaleksis/core/models.py
- aleksis/core/preferences.py 13 additions, 0 deletionsaleksis/core/preferences.py
- aleksis/core/rules.py 51 additions, 45 deletionsaleksis/core/rules.py
- aleksis/core/settings.py 9 additions, 6 deletionsaleksis/core/settings.py
- aleksis/core/templates/core/announcement/form.html 7 additions, 1 deletionaleksis/core/templates/core/announcement/form.html
- aleksis/core/templates/core/group/edit.html 8 additions, 1 deletionaleksis/core/templates/core/group/edit.html
- aleksis/core/templates/core/group/full.html 20 additions, 0 deletionsaleksis/core/templates/core/group/full.html
- aleksis/core/templates/core/partials/language_form.html 1 addition, 2 deletionsaleksis/core/templates/core/partials/language_form.html
- aleksis/core/templates/core/person/accounts.html 8 additions, 1 deletionaleksis/core/templates/core/person/accounts.html
- aleksis/core/templates/core/person/edit.html 4 additions, 1 deletionaleksis/core/templates/core/person/edit.html
Loading
Please register or sign in to comment