Merge tag 'v1.0.1' into merge-1.0.1
Showing
- CHANGELOG 16 additions, 0 deletionsCHANGELOG
- Dockerfile 13 additions, 2 deletionsDockerfile
- debian-files/smasch.service 1 addition, 1 deletiondebian-files/smasch.service
- docker-compose.yml 4 additions, 4 deletionsdocker-compose.yml
- docker/nginx/nginx.conf 1 addition, 1 deletiondocker/nginx/nginx.conf
- docker/nginx/smasch.conf 1 addition, 1 deletiondocker/nginx/smasch.conf
- local_settings_ci.py 2 additions, 0 deletionslocal_settings_ci.py
- smash/web/docx_helper.py 11 additions, 7 deletionssmash/web/docx_helper.py
- smash/web/forms/study_subject_forms.py 6 additions, 4 deletionssmash/web/forms/study_subject_forms.py
- smash/web/models/mail_template.py 3 additions, 3 deletionssmash/web/models/mail_template.py
- smash/web/templates/appointments/index.html 5 additions, 2 deletionssmash/web/templates/appointments/index.html
- smash/web/templates/visits/details.html 2 additions, 2 deletionssmash/web/templates/visits/details.html
- smash/web/tests/models/test_mail_template.py 24 additions, 10 deletionssmash/web/tests/models/test_mail_template.py
Loading
Please register or sign in to comment