Merge branch 'master' into feature/provenance
Showing
- smash/web/api_views/subject.py 24 additions, 0 deletionssmash/web/api_views/subject.py
- smash/web/forms/study_subject_forms.py 1 addition, 0 deletionssmash/web/forms/study_subject_forms.py
- smash/web/migrations/0148_auto_20200319_1301.py 23 additions, 0 deletionssmash/web/migrations/0148_auto_20200319_1301.py
- smash/web/migrations/0149_auto_20200319_1415.py 19 additions, 0 deletionssmash/web/migrations/0149_auto_20200319_1415.py
- smash/web/migrations/0150_auto_20200319_1446.py 19 additions, 0 deletionssmash/web/migrations/0150_auto_20200319_1446.py
- smash/web/migrations/0151_auto_20200319_1518.py 19 additions, 0 deletionssmash/web/migrations/0151_auto_20200319_1518.py
- smash/web/migrations/0152_add_permissions_to_existing_workers.py 24 additions, 0 deletions...eb/migrations/0152_add_permissions_to_existing_workers.py
- smash/web/migrations/0153_auto_20200320_0932.py 55 additions, 0 deletionssmash/web/migrations/0153_auto_20200320_0932.py
- smash/web/models/appointment.py 4 additions, 0 deletionssmash/web/models/appointment.py
- smash/web/models/appointment_type_link.py 4 additions, 0 deletionssmash/web/models/appointment_type_link.py
- smash/web/models/study_columns.py 7 additions, 4 deletionssmash/web/models/study_columns.py
- smash/web/models/study_subject.py 5 additions, 0 deletionssmash/web/models/study_subject.py
- smash/web/models/subject.py 25 additions, 5 deletionssmash/web/models/subject.py
- smash/web/models/subject_columns.py 15 additions, 0 deletionssmash/web/models/subject_columns.py
- smash/web/templates/sidebar.html 60 additions, 39 deletionssmash/web/templates/sidebar.html
- smash/web/templates/subjects/edit.html 5 additions, 0 deletionssmash/web/templates/subjects/edit.html
- smash/web/tests/view/test_daily_planning.py 20 additions, 0 deletionssmash/web/tests/view/test_daily_planning.py
- smash/web/tests/view/test_equipments.py 12 additions, 0 deletionssmash/web/tests/view/test_equipments.py
- smash/web/tests/view/test_export.py 21 additions, 0 deletionssmash/web/tests/view/test_export.py
- smash/web/tests/view/test_flying_teams.py 14 additions, 0 deletionssmash/web/tests/view/test_flying_teams.py
Loading
Please register or sign in to comment