Merge branch 'feature/holidays' into dev
# Conflicts: # .idea/dataSources.local.xml # schoolapps/static/common/style.css # schoolapps/timetable/templates/timetable/plan.html # schoolapps/timetable/views.py # schoolapps/untisconnect/plan.py
No related branches found
No related tags found
Showing
- .idea/vcs.xml 1 addition, 0 deletions.idea/vcs.xml
- schoolapps/static/common/style.css 16 additions, 0 deletionsschoolapps/static/common/style.css
- schoolapps/timetable/templates/timetable/lesson.html 10 additions, 3 deletionsschoolapps/timetable/templates/timetable/lesson.html
- schoolapps/timetable/templates/timetable/myplan.html 3 additions, 0 deletionsschoolapps/timetable/templates/timetable/myplan.html
- schoolapps/timetable/templates/timetable/plan.html 20 additions, 14 deletionsschoolapps/timetable/templates/timetable/plan.html
- schoolapps/timetable/views.py 10 additions, 4 deletionsschoolapps/timetable/views.py
- schoolapps/untisconnect/api.py 30 additions, 0 deletionsschoolapps/untisconnect/api.py
- schoolapps/untisconnect/plan.py 15 additions, 1 deletionschoolapps/untisconnect/plan.py
Loading
Please register or sign in to comment