Merge branch '331-user-registration' of...
Merge branch '331-user-registration' of edugit.org:AlekSIS/official/AlekSIS-Core into 331-user-registration
Showing
- .github/PULL_REQUEST_TEMPLATE.md 11 additions, 0 deletions.github/PULL_REQUEST_TEMPLATE.md
- aleksis/core/menus.py 13 additions, 1 deletionaleksis/core/menus.py
- aleksis/core/mixins.py 8 additions, 0 deletionsaleksis/core/mixins.py
- aleksis/core/models.py 3 additions, 3 deletionsaleksis/core/models.py
- aleksis/core/preferences.py 11 additions, 0 deletionsaleksis/core/preferences.py
- aleksis/core/rules.py 7 additions, 0 deletionsaleksis/core/rules.py
- aleksis/core/settings.py 12 additions, 1 deletionaleksis/core/settings.py
- aleksis/core/static/js/main.js 5 additions, 0 deletionsaleksis/core/static/js/main.js
- aleksis/core/static/print_landscape.css 19 additions, 0 deletionsaleksis/core/static/print_landscape.css
- aleksis/core/static/style.scss 5 additions, 0 deletionsaleksis/core/static/style.scss
- aleksis/core/templates/account/password_change.html 4 additions, 4 deletionsaleksis/core/templates/account/password_change.html
- aleksis/core/templates/account/password_reset.html 3 additions, 3 deletionsaleksis/core/templates/account/password_reset.html
- aleksis/core/templates/account/password_reset_done.html 1 addition, 1 deletionaleksis/core/templates/account/password_reset_done.html
- aleksis/core/templates/account/password_reset_from_key.html 3 additions, 2 deletionsaleksis/core/templates/account/password_reset_from_key.html
- aleksis/core/templates/account/password_set.html 2 additions, 2 deletionsaleksis/core/templates/account/password_set.html
- aleksis/core/templates/core/base_print.html 4 additions, 2 deletionsaleksis/core/templates/core/base_print.html
- aleksis/core/templates/dynamic_preferences/form.html 2 additions, 0 deletionsaleksis/core/templates/dynamic_preferences/form.html
- aleksis/core/templates/material/fields/colorfield_colorwidget.html 32 additions, 0 deletions...ore/templates/material/fields/colorfield_colorwidget.html
- aleksis/core/templatetags/dashboard.py 4 additions, 3 deletionsaleksis/core/templatetags/dashboard.py
- aleksis/core/urls.py 12 additions, 0 deletionsaleksis/core/urls.py
Loading
Please register or sign in to comment