Merge remote-tracking branch 'origin/master' into 124-connection-to-redcap (710e3009) · 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

710e3009

There was a problem fetching the pipeline metadata.

Commit 710e3009 authored 7 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 124-connection-to-redcap

parents 1f420cd1 776e73c5

No related branches found

No related tags found

1 merge request!71languages are not included in default merge inconsistencies

Pipeline #

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

smash/web/api_views/daily_planning.py 1 addition, 1 deletion

smash/web/api_views/daily_planning.py
smash/web/templates/_base.html 1 addition, 1 deletion

smash/web/templates/_base.html
smash/web/templates/doctors/add_availability.html 0 additions, 12 deletions

smash/web/templates/doctors/add_availability.html
smash/web/templates/subjects/visitdetails.html 4 additions, 2 deletions

smash/web/templates/subjects/visitdetails.html
smash/web/tests/api_views/test_daily_planning.py 28 additions, 2 deletions

smash/web/tests/api_views/test_daily_planning.py
smash/web/tests/functions.py 5 additions, 2 deletions

smash/web/tests/functions.py
smash/web/tests/test_view_subjects.py 8 additions, 0 deletions

smash/web/tests/test_view_subjects.py
smash/web/views/subject.py 7 additions, 3 deletions

smash/web/views/subject.py

with 54 additions and 23 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