Merge branch 'master' into '125-migrate-missing-templates-to-materialize'
# Conflicts: # aleksis/core/settings.py
No related branches found
No related tags found
Showing
- .mailmap 16 additions, 0 deletions.mailmap
- LICENCE 0 additions, 191 deletionsLICENCE
- LICENCE.rst 318 additions, 0 deletionsLICENCE.rst
- aleksis/core/dashboard/views/tools.py 0 additions, 4 deletionsaleksis/core/dashboard/views/tools.py
- aleksis/core/schoolapps/settings.py 0 additions, 30 deletionsaleksis/core/schoolapps/settings.py
- aleksis/core/schoolapps/urls.py 0 additions, 1 deletionaleksis/core/schoolapps/urls.py
- aleksis/core/settings.py 29 additions, 2 deletionsaleksis/core/settings.py
- aleksis/core/static/common/favicon.ico 0 additions, 0 deletionsaleksis/core/static/common/favicon.ico
- aleksis/core/static/common/logo.png 0 additions, 0 deletionsaleksis/core/static/common/logo.png
- aleksis/core/static/common/serviceworker.js 0 additions, 115 deletionsaleksis/core/static/common/serviceworker.js
- aleksis/core/static/js/serviceworker.js 105 additions, 0 deletionsaleksis/core/static/js/serviceworker.js
- aleksis/core/templates/core/base.html 8 additions, 2 deletionsaleksis/core/templates/core/base.html
- aleksis/core/templates/core/icons.html 0 additions, 7 deletionsaleksis/core/templates/core/icons.html
- aleksis/core/templates/core/turnable.html 2 additions, 2 deletionsaleksis/core/templates/core/turnable.html
- aleksis/core/templates/partials/header.html 1 addition, 3 deletionsaleksis/core/templates/partials/header.html
- aleksis/core/urls.py 2 additions, 0 deletionsaleksis/core/urls.py
- aleksis/core/views.py 4 additions, 0 deletionsaleksis/core/views.py
- apps/official/AlekSIS-App-Alsijil 1 addition, 1 deletionapps/official/AlekSIS-App-Alsijil
- apps/official/AlekSIS-App-Chronos 1 addition, 1 deletionapps/official/AlekSIS-App-Chronos
- apps/official/AlekSIS-App-Exlibris 1 addition, 1 deletionapps/official/AlekSIS-App-Exlibris
Loading
Please register or sign in to comment