Merge remote-tracking branch 'origin/feature/pwa-optimization' into pwa
# Conflicts: # schoolapps/schoolapps/settings.py # schoolapps/templates/partials/header.html
No related branches found
No related tags found
Showing
- schoolapps/aub/models.py 1 addition, 0 deletionsschoolapps/aub/models.py
- schoolapps/aub/templates/aub/applied_for.html 2 additions, 0 deletionsschoolapps/aub/templates/aub/applied_for.html
- schoolapps/aub/templates/aub/index.html 5 additions, 0 deletionsschoolapps/aub/templates/aub/index.html
- schoolapps/dashboard/views.py 1 addition, 1 deletionschoolapps/dashboard/views.py
- schoolapps/faq/migrations/0004_auto_20190806_2150.py 1393 additions, 0 deletionsschoolapps/faq/migrations/0004_auto_20190806_2150.py
- schoolapps/helper.py 2 additions, 2 deletionsschoolapps/helper.py
- schoolapps/menu/templates/menu/index.html 9 additions, 8 deletionsschoolapps/menu/templates/menu/index.html
- schoolapps/menu/templates/menu/upload.html 8 additions, 10 deletionsschoolapps/menu/templates/menu/upload.html
- schoolapps/schoolapps/settings.py 7 additions, 82 deletionsschoolapps/schoolapps/settings.py
- schoolapps/static/common/helper.js 13 additions, 4 deletionsschoolapps/static/common/helper.js
- schoolapps/static/common/style.css 38 additions, 3 deletionsschoolapps/static/common/style.css
- schoolapps/templates/components/msgbox.html 5 additions, 5 deletionsschoolapps/templates/components/msgbox.html
- schoolapps/templates/mail/notification.html 2 additions, 2 deletionsschoolapps/templates/mail/notification.html
- schoolapps/templates/mail/notification.txt 2 additions, 2 deletionsschoolapps/templates/mail/notification.txt
- schoolapps/templates/partials/footer.html 23 additions, 3 deletionsschoolapps/templates/partials/footer.html
- schoolapps/templates/partials/header.html 151 additions, 100 deletionsschoolapps/templates/partials/header.html
- schoolapps/templatetags/__init__.py 0 additions, 0 deletionsschoolapps/templatetags/__init__.py
- schoolapps/templatetags/apps.py 5 additions, 0 deletionsschoolapps/templatetags/apps.py
- schoolapps/templatetags/templatetags/__init__.py 0 additions, 0 deletionsschoolapps/templatetags/templatetags/__init__.py
- schoolapps/templatetags/templatetags/url_name.py 10 additions, 0 deletionsschoolapps/templatetags/templatetags/url_name.py
Loading
Please register or sign in to comment