Merge branch 'master' of https://git-r3lab.uni.lu/piotr.atyjaszyk/scheduling-system (a6b4474f) · 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

Admin message

Gitlab will go in to maintenance on Friday 5:30pm since SIU is doing Isilon maintenance and we use isilon shares on the Gitlab

a6b4474f

Commit a6b4474f authored 8 years ago by Piotr Matyjaszyk

Downloads
- Plain Diff

Merge branch 'master' of https://git-r3lab.uni.lu/piotr.atyjaszyk/scheduling-system

parents d967adc3 24f124fe

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

readme.md 1 addition, 0 deletions

readme.md
smash/web/forms.py 4 additions, 0 deletions

smash/web/forms.py
smash/web/models.py 23 additions, 12 deletions

smash/web/models.py
smash/web/templates/_base.html 2 additions, 2 deletions

smash/web/templates/_base.html
smash/web/templates/assignments/index.html 1 addition, 1 deletion

smash/web/templates/assignments/index.html
smash/web/templates/doctors/details.html 1 addition, 1 deletion

smash/web/templates/doctors/details.html
smash/web/templates/subjects/index.html 1 addition, 1 deletion

smash/web/templates/subjects/index.html
smash/web/views.py 1 addition, 2 deletions

smash/web/views.py

with 34 additions and 19 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