Issue #271 Fixed conflict
Showing
- smash/create_dummy_data.py 9 additions, 3 deletionssmash/create_dummy_data.py
- smash/import_file.py 132 additions, 20 deletionssmash/import_file.py
- smash/web/api_views/subject.py 1 addition, 1 deletionsmash/web/api_views/subject.py
- smash/web/api_views/worker.py 1 addition, 1 deletionsmash/web/api_views/worker.py
- smash/web/forms/mail_template.py 24 additions, 0 deletionssmash/web/forms/mail_template.py
- smash/web/forms/voucher_forms.py 2 additions, 1 deletionsmash/web/forms/voucher_forms.py
- smash/web/migrations/0130_study_visits_to_show_in_subject_list.py 21 additions, 0 deletions...b/migrations/0130_study_visits_to_show_in_subject_list.py
- smash/web/migrations/0131_study_default_voucher_expiration_in_months.py 21 additions, 0 deletions...ations/0131_study_default_voucher_expiration_in_months.py
- smash/web/models/study.py 13 additions, 0 deletionssmash/web/models/study.py
- smash/web/models/voucher_type.py 2 additions, 2 deletionssmash/web/models/voucher_type.py
- smash/web/models/worker.py 22 additions, 6 deletionssmash/web/models/worker.py
- smash/web/officeAvailability.py 38 additions, 1 deletionsmash/web/officeAvailability.py
- smash/web/static/js/daily_planning.js 1 addition, 1 deletionsmash/web/static/js/daily_planning.js
- smash/web/templates/includes/subject_vouchers_box.html 13 additions, 3 deletionssmash/web/templates/includes/subject_vouchers_box.html
- smash/web/templates/mail_templates/add_edit.html 58 additions, 2 deletionssmash/web/templates/mail_templates/add_edit.html
- smash/web/tests/data/voucher_pdp.docx 0 additions, 0 deletionssmash/web/tests/data/voucher_pdp.docx
- smash/web/tests/test_office_availability.py 74 additions, 1 deletionsmash/web/tests/test_office_availability.py
- smash/web/urls.py 5 additions, 5 deletionssmash/web/urls.py
- smash/web/views/mails.py 29 additions, 19 deletionssmash/web/views/mails.py
Loading
Please register or sign in to comment