Merge remote-tracking branch 'origin/devel_1.0.x' into docker-issue (f52dc14e) · 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

f52dc14e

Commit f52dc14e authored 4 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/devel_1.0.x' into docker-issue

parents 7a1c9ee2 8c7c6b90

No related branches found

No related tags found

3 merge requests!316Merge 1.0.1,!3151.0.1 into master,!313Docker issue

Pipeline #38487 passed 4 years ago

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 10 additions, 1 deletion

CHANGELOG
debian-files/smasch.service 1 addition, 1 deletion

debian-files/smasch.service
smash/web/docx_helper.py 11 additions, 7 deletions

smash/web/docx_helper.py
smash/web/forms/study_subject_forms.py 8 additions, 6 deletions

smash/web/forms/study_subject_forms.py
smash/web/models/mail_template.py 3 additions, 3 deletions

smash/web/models/mail_template.py
smash/web/templates/appointments/index.html 5 additions, 2 deletions

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

smash/web/templates/visits/details.html
smash/web/tests/models/test_mail_template.py 24 additions, 10 deletions

smash/web/tests/models/test_mail_template.py

with 64 additions and 32 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