Merge branch 'feature/timetable-hints' into feature/refactor-sub-generator
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 2 deletions.gitignore
- .idea/school-apps.iml 0 additions, 3 deletions.idea/school-apps.iml
- README.md 1 addition, 0 deletionsREADME.md
- schoolapps/aub/migrations/0012_auto_20190410_1416.py 24 additions, 0 deletionsschoolapps/aub/migrations/0012_auto_20190410_1416.py
- schoolapps/aub/migrations/0013_auto_20190411_1203.py 17 additions, 0 deletionsschoolapps/aub/migrations/0013_auto_20190411_1203.py
- schoolapps/dashboard/migrations/0003_auto_20190410_1416.py 27 additions, 0 deletionsschoolapps/dashboard/migrations/0003_auto_20190410_1416.py
- schoolapps/schoolapps/settings.py 6 additions, 0 deletionsschoolapps/schoolapps/settings.py
- schoolapps/schoolapps/urls.py 4 additions, 1 deletionschoolapps/schoolapps/urls.py
- schoolapps/static/common/helper.js 10 additions, 0 deletionsschoolapps/static/common/helper.js
- schoolapps/static/common/style.css 49 additions, 39 deletionsschoolapps/static/common/style.css
- schoolapps/static/js/jquery/jquery-3.3.1.min.js 2 additions, 0 deletionsschoolapps/static/js/jquery/jquery-3.3.1.min.js
- schoolapps/templates/martor/editor.html 71 additions, 0 deletionsschoolapps/templates/martor/editor.html
- schoolapps/templates/martor/emoji.html 14 additions, 0 deletionsschoolapps/templates/martor/emoji.html
- schoolapps/templates/martor/guide.html 173 additions, 0 deletionsschoolapps/templates/martor/guide.html
- schoolapps/templates/martor/toolbar.html 81 additions, 0 deletionsschoolapps/templates/martor/toolbar.html
- schoolapps/templates/partials/footer.html 0 additions, 1 deletionschoolapps/templates/partials/footer.html
- schoolapps/templates/partials/header.html 16 additions, 2 deletionsschoolapps/templates/partials/header.html
- schoolapps/timetable/admin.py 4 additions, 0 deletionsschoolapps/timetable/admin.py
- schoolapps/timetable/filters.py 16 additions, 0 deletionsschoolapps/timetable/filters.py
- schoolapps/timetable/forms.py 17 additions, 0 deletionsschoolapps/timetable/forms.py
Loading
Please register or sign in to comment