Merge branch 'master' into hotfix/office_availability
Showing
- smash/import_file.py 89 additions, 10 deletionssmash/import_file.py
- smash/web/api_views/subject.py 1 addition, 1 deletionsmash/web/api_views/subject.py
- smash/web/migrations/0130_study_visits_to_show_in_subject_list.py 21 additions, 0 deletions...b/migrations/0130_study_visits_to_show_in_subject_list.py
- smash/web/models/study.py 7 additions, 0 deletionssmash/web/models/study.py
- smash/web/models/study_subject.py 20 additions, 17 deletionssmash/web/models/study_subject.py
- smash/web/tests/test_office_availability.py 3 additions, 1 deletionsmash/web/tests/test_office_availability.py
Loading
Please register or sign in to comment