Merge tag 'v1.0.1' into merge-1.0.1 (a92e842b) · 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

a92e842b

Commit a92e842b authored 3 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge tag 'v1.0.1' into merge-1.0.1

parents d15d9c8d a8c33871

No related branches found

No related tags found

1 merge request!316Merge 1.0.1

Pipeline #38748 failed 3 years ago

Changes 13
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 16 additions, 0 deletions

CHANGELOG
Dockerfile 13 additions, 2 deletions

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

debian-files/smasch.service
docker-compose.yml 4 additions, 4 deletions

docker-compose.yml
docker/nginx/nginx.conf 1 addition, 1 deletion

docker/nginx/nginx.conf
docker/nginx/smasch.conf 1 addition, 1 deletion

docker/nginx/smasch.conf
local_settings_ci.py 2 additions, 0 deletions

local_settings_ci.py
smash/web/docx_helper.py 11 additions, 7 deletions

smash/web/docx_helper.py
smash/web/forms/study_subject_forms.py 6 additions, 4 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 89 additions and 37 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