Merge branch 'master' into update/merge_12_into_13
Showing
- smash/web/api_urls.py 11 additions, 1 deletionsmash/web/api_urls.py
- smash/web/api_views/appointment.py 2 additions, 0 deletionssmash/web/api_views/appointment.py
- smash/web/api_views/daily_planning.py 33 additions, 6 deletionssmash/web/api_views/daily_planning.py
- smash/web/api_views/worker.py 39 additions, 1 deletionsmash/web/api_views/worker.py
- smash/web/decorators.py 8 additions, 1 deletionsmash/web/decorators.py
- smash/web/forms/study_subject_forms.py 4 additions, 2 deletionssmash/web/forms/study_subject_forms.py
- smash/web/static/AdminLTE/plugins/jQueryUI/jquery-ui.min.css 7 additions, 0 deletionssmash/web/static/AdminLTE/plugins/jQueryUI/jquery-ui.min.css
- smash/web/static/AdminLTE/plugins/jQueryUI/jquery-ui.structure.min.css 5 additions, 0 deletions...tic/AdminLTE/plugins/jQueryUI/jquery-ui.structure.min.css
- smash/web/static/AdminLTE/plugins/jQueryUI/jquery-ui.theme.min.css 5 additions, 0 deletions.../static/AdminLTE/plugins/jQueryUI/jquery-ui.theme.min.css
- smash/web/static/AdminLTE/plugins/moment.js/moment-range.min.js 2 additions, 0 deletions...web/static/AdminLTE/plugins/moment.js/moment-range.min.js
- smash/web/static/css/daily_planning.css 0 additions, 1 deletionsmash/web/static/css/daily_planning.css
- smash/web/static/js/appointment.js 1 addition, 0 deletionssmash/web/static/js/appointment.js
- smash/web/static/js/daily_planning.js 209 additions, 84 deletionssmash/web/static/js/daily_planning.js
- smash/web/templates/appointment_types/add.html 9 additions, 0 deletionssmash/web/templates/appointment_types/add.html
- smash/web/templates/appointment_types/add_edit.html 77 additions, 0 deletionssmash/web/templates/appointment_types/add_edit.html
- smash/web/templates/appointment_types/breadcrumb.html 5 additions, 0 deletionssmash/web/templates/appointment_types/breadcrumb.html
- smash/web/templates/appointment_types/confirm_delete.html 62 additions, 0 deletionssmash/web/templates/appointment_types/confirm_delete.html
- smash/web/templates/appointment_types/edit.html 10 additions, 0 deletionssmash/web/templates/appointment_types/edit.html
- smash/web/templates/appointment_types/index.html 118 additions, 0 deletionssmash/web/templates/appointment_types/index.html
- smash/web/templates/appointments/add.html 25 additions, 0 deletionssmash/web/templates/appointments/add.html
Loading
Please register or sign in to comment