Merge branch 'dev' of https://github.com/Katharineum/school-apps into dev
# Conflicts: # .idea/misc.xml # .idea/school-apps.iml
No related branches found
No related tags found
Showing
- .idea/jsLibraryMappings.xml 1 addition, 1 deletion.idea/jsLibraryMappings.xml
- .idea/misc.xml 1 addition, 1 deletion.idea/misc.xml
- .idea/school-apps.iml 4 additions, 2 deletions.idea/school-apps.iml
- schoolapps/static/jquery/jquery-3.3.1.slim.min.js 2 additions, 0 deletionsschoolapps/static/jquery/jquery-3.3.1.slim.min.js
- schoolapps/static/jquery/jquery.js 10219 additions, 0 deletionsschoolapps/static/jquery/jquery.js
- schoolapps/static/materialdesignicons-webfont/MaterialIcons-Regular.eot 0 additions, 0 deletions...tic/materialdesignicons-webfont/MaterialIcons-Regular.eot
- schoolapps/static/materialdesignicons-webfont/MaterialIcons-Regular.ijmap 1 addition, 0 deletions...c/materialdesignicons-webfont/MaterialIcons-Regular.ijmap
- schoolapps/static/materialdesignicons-webfont/MaterialIcons-Regular.svg 2373 additions, 0 deletions...tic/materialdesignicons-webfont/MaterialIcons-Regular.svg
- schoolapps/static/materialdesignicons-webfont/MaterialIcons-Regular.ttf 0 additions, 0 deletions...tic/materialdesignicons-webfont/MaterialIcons-Regular.ttf
- schoolapps/static/materialdesignicons-webfont/MaterialIcons-Regular.woff 0 additions, 0 deletions...ic/materialdesignicons-webfont/MaterialIcons-Regular.woff
- schoolapps/static/materialdesignicons-webfont/MaterialIcons-Regular.woff2 0 additions, 0 deletions...c/materialdesignicons-webfont/MaterialIcons-Regular.woff2
- schoolapps/static/materialdesignicons-webfont/README.md 9 additions, 0 deletionsschoolapps/static/materialdesignicons-webfont/README.md
- schoolapps/static/materialdesignicons-webfont/codepoints 932 additions, 0 deletionsschoolapps/static/materialdesignicons-webfont/codepoints
- schoolapps/static/materialdesignicons-webfont/material-icons.css 36 additions, 0 deletions...pps/static/materialdesignicons-webfont/material-icons.css
- schoolapps/templates/partials/header.html 7 additions, 13 deletionsschoolapps/templates/partials/header.html
- schoolapps/timetable/views.py 7 additions, 8 deletionsschoolapps/timetable/views.py
- schoolapps/untisconnect/api.py 30 additions, 1 deletionschoolapps/untisconnect/api.py
- schoolapps/untisconnect/api_helper.py 13 additions, 0 deletionsschoolapps/untisconnect/api_helper.py
- schoolapps/untisconnect/sub.py 37 additions, 32 deletionsschoolapps/untisconnect/sub.py
Loading
Please register or sign in to comment