Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-Core
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

249d900e

Commit 249d900e authored 6 years ago by Hangzhi Yu

Downloads
- Plain Diff

Merge branches 'dev' and 'pwa-optimized' of...

Merge branches 'dev' and 'pwa-optimized' of https://github.com/Katharineum/school-apps into pwa-optimized

parents a2789973 095a4610

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.idea/vcs.xml 1 addition, 0 deletions

.idea/vcs.xml
schoolapps/dashboard/migrations/0002_auto_20190102_1724.py 0 additions, 21 deletions

schoolapps/dashboard/migrations/0002_auto_20190102_1724.py
schoolapps/schoolapps/example_secure_settings.py 1 addition, 1 deletion

schoolapps/schoolapps/example_secure_settings.py
schoolapps/schoolapps/settings.py 4 additions, 1 deletion

schoolapps/schoolapps/settings.py
schoolapps/timetable/templates/timetable/plan.html 47 additions, 9 deletions

schoolapps/timetable/templates/timetable/plan.html
schoolapps/timetable/views.py 3 additions, 2 deletions

schoolapps/timetable/views.py

with 56 additions and 34 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment