Merge branch 'master' into hotfix/voucher_templates (a840f0eb) · Commits · SMASCH / scheduling-system · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

scheduling-system
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- External wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

a840f0eb

Commit a840f0eb authored 6 years ago by Carlos Vega

Downloads
- Plain Diff

Merge branch 'master' into hotfix/voucher_templates

parents 13d5c4c5 5cc0b4a0

No related branches found

No related tags found

1 merge request!185Hotfix/voucher templates

Pipeline #7305 passed 6 years ago

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

smash/import_file.py 89 additions, 10 deletions

smash/import_file.py
smash/web/api_views/subject.py 1 addition, 1 deletion

smash/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 deletions

smash/web/models/study.py
smash/web/models/study_subject.py 20 additions, 17 deletions

smash/web/models/study_subject.py
smash/web/models/worker.py 1 addition, 1 deletion

smash/web/models/worker.py
smash/web/tests/test_office_availability.py 4 additions, 1 deletion

smash/web/tests/test_office_availability.py

with 143 additions and 30 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