Merge branch 'merge-1.0.2' into 'master'
1.0.2 merged into master See merge request NCER-PD/scheduling-system!348
Showing
- CHANGELOG 30 additions, 0 deletionsCHANGELOG
- debian-files/smasch.service 1 addition, 1 deletiondebian-files/smasch.service
- smash/smash/middleware/force_2fa_middleware.py 3 additions, 1 deletionsmash/smash/middleware/force_2fa_middleware.py
- smash/web/api_views/subject.py 3 additions, 1 deletionsmash/web/api_views/subject.py
- smash/web/forms/appointment_form.py 6 additions, 2 deletionssmash/web/forms/appointment_form.py
- smash/web/migrations/0193_auto_20210820_1222.py 23 additions, 0 deletionssmash/web/migrations/0193_auto_20210820_1222.py
- smash/web/migrations/0196_merge_20210824_0809.py 14 additions, 0 deletionssmash/web/migrations/0196_merge_20210824_0809.py
- smash/web/models/appointment.py 1 addition, 1 deletionsmash/web/models/appointment.py
- smash/web/models/study_columns.py 1 addition, 1 deletionsmash/web/models/study_columns.py
- smash/web/static/js/appointment.js 3 additions, 3 deletionssmash/web/static/js/appointment.js
- smash/web/static/js/daily_planning.js 21 additions, 7 deletionssmash/web/static/js/daily_planning.js
- smash/web/templates/appointment_types/edit.html 2 additions, 2 deletionssmash/web/templates/appointment_types/edit.html
- smash/web/templates/appointments/add.html 49 additions, 36 deletionssmash/web/templates/appointments/add.html
- smash/web/templates/daily_planning/breadcrumb.html 2 additions, 0 deletionssmash/web/templates/daily_planning/breadcrumb.html
- smash/web/templates/daily_planning/index.html 1 addition, 1 deletionsmash/web/templates/daily_planning/index.html
- smash/web/templates/doctors/add.html 2 additions, 5 deletionssmash/web/templates/doctors/add.html
- smash/web/templates/doctors/breadcrumb.html 5 additions, 5 deletionssmash/web/templates/doctors/breadcrumb.html
- smash/web/templates/doctors/edit.html 1 addition, 1 deletionsmash/web/templates/doctors/edit.html
- smash/web/templates/statistics/index.html 1 addition, 1 deletionsmash/web/templates/statistics/index.html
- smash/web/templates/subjects/edit.html 1 addition, 1 deletionsmash/web/templates/subjects/edit.html
Loading
Please register or sign in to comment