Merge branch 'master' into 249-ldap-allow-multiple-search-bases-for-users-and-groups
No related branches found
No related tags found
Showing
- aleksis/core/apps.py 4 additions, 0 deletionsaleksis/core/apps.py
- aleksis/core/forms.py 27 additions, 5 deletionsaleksis/core/forms.py
- aleksis/core/managers.py 81 additions, 0 deletionsaleksis/core/managers.py
- aleksis/core/menus.py 22 additions, 0 deletionsaleksis/core/menus.py
- aleksis/core/migrations/0002_school_term.py 64 additions, 0 deletionsaleksis/core/migrations/0002_school_term.py
- aleksis/core/mixins.py 72 additions, 3 deletionsaleksis/core/mixins.py
- aleksis/core/models.py 73 additions, 6 deletionsaleksis/core/models.py
- aleksis/core/rules.py 72 additions, 19 deletionsaleksis/core/rules.py
- aleksis/core/settings.py 16 additions, 1 deletionaleksis/core/settings.py
- aleksis/core/static/js/main.js 13 additions, 0 deletionsaleksis/core/static/js/main.js
- aleksis/core/static/js/progress.js 69 additions, 0 deletionsaleksis/core/static/js/progress.js
- aleksis/core/static/print.css 23 additions, 1 deletionaleksis/core/static/print.css
- aleksis/core/static/style.scss 9 additions, 0 deletionsaleksis/core/static/style.scss
- aleksis/core/tables.py 35 additions, 0 deletionsaleksis/core/tables.py
- aleksis/core/templates/403.html 11 additions, 5 deletionsaleksis/core/templates/403.html
- aleksis/core/templates/404.html 1 addition, 1 deletionaleksis/core/templates/404.html
- aleksis/core/templates/500.html 2 additions, 2 deletionsaleksis/core/templates/500.html
- aleksis/core/templates/503.html 2 additions, 2 deletionsaleksis/core/templates/503.html
- aleksis/core/templates/core/additional_field/edit.html 17 additions, 0 deletionsaleksis/core/templates/core/additional_field/edit.html
- aleksis/core/templates/core/additional_field/list.html 18 additions, 0 deletionsaleksis/core/templates/core/additional_field/list.html
Loading
Please register or sign in to comment