Merge remote-tracking branch 'origin/master' into bump-requirements
Showing
- CHANGELOG 3 additions, 0 deletionsCHANGELOG
- requirements.txt 1 addition, 0 deletionsrequirements.txt
- smash/smash/local_settings.py.template 4 additions, 0 deletionssmash/smash/local_settings.py.template
- smash/smash/middleware/__init__.py 3 additions, 0 deletionssmash/smash/middleware/__init__.py
- smash/smash/middleware/force_2fa_middleware.py 27 additions, 0 deletionssmash/smash/middleware/force_2fa_middleware.py
- smash/smash/settings.py 6 additions, 0 deletionssmash/smash/settings.py
- smash/web/admin.py 2 additions, 1 deletionsmash/web/admin.py
- smash/web/api_urls.py 1 addition, 0 deletionssmash/web/api_urls.py
- smash/web/api_views/subject.py 18 additions, 18 deletionssmash/web/api_views/subject.py
- smash/web/api_views/worker.py 9 additions, 0 deletionssmash/web/api_views/worker.py
- smash/web/forms/__init__.py 3 additions, 2 deletionssmash/web/forms/__init__.py
- smash/web/forms/privacy_notice.py 15 additions, 0 deletionssmash/web/forms/privacy_notice.py
- smash/web/forms/worker_form.py 16 additions, 1 deletionsmash/web/forms/worker_form.py
- smash/web/importer/csv_tns_subject_import_reader.py 2 additions, 2 deletionssmash/web/importer/csv_tns_subject_import_reader.py
- smash/web/middleware.py 39 additions, 0 deletionssmash/web/middleware.py
- smash/web/migrations/0001_initial.py 1 addition, 1 deletionsmash/web/migrations/0001_initial.py
- smash/web/migrations/0022_auto_20170403_0904.py 6 additions, 6 deletionssmash/web/migrations/0022_auto_20170403_0904.py
- smash/web/migrations/0023_auto_20170404_1047.py 9 additions, 9 deletionssmash/web/migrations/0023_auto_20170404_1047.py
- smash/web/migrations/0024_configurationitem.py 3 additions, 3 deletionssmash/web/migrations/0024_configurationitem.py
- smash/web/migrations/0026_location_color.py 1 addition, 1 deletionsmash/web/migrations/0026_location_color.py
Loading
Please register or sign in to comment