Merge branch 'appointments-dev' into 'master' (8d61f5ca) · 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

8d61f5ca

Commit 8d61f5ca authored 8 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'appointments-dev' into 'master'

Appointments dev

See merge request !1

parents 77471d99 3c3e9265

No related branches found

No related tags found

1 merge request!1Appointments dev

Changes 87

Expand all Hide whitespace changes

Inline Side-by-side

Showing

smash/web/templates/visits/details.html 26 additions, 8 deletions

smash/web/templates/visits/details.html
smash/web/templates/visits/index.html 2 additions, 6 deletions

smash/web/templates/visits/index.html
smash/web/tests/test_SubjectAddForm.py 2 additions, 1 deletion

smash/web/tests/test_SubjectAddForm.py
smash/web/tests/test_SubjectEditForm.py 2 additions, 1 deletion

smash/web/tests/test_SubjectEditForm.py
smash/web/tests/test_VisitAddForm.py 2 additions, 2 deletions

smash/web/tests/test_VisitAddForm.py
smash/web/urls.py 2 additions, 0 deletions

smash/web/urls.py
smash/web/views.py 36 additions, 6 deletions

smash/web/views.py

with 72 additions and 24 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