Rebecca Law c99df69025 Merge branch 'master' into fix-permissions ...

Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py

2016-03-30 10:36:55 +01:00

..

dao

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

views

Merge branch 'master' into fix-permissions

2016-03-30 10:36:55 +01:00

__init__.py

A platform admin user is able to see a list of all services.

2016-03-17 10:46:47 +00:00

encryption.py

…

forms.py

Set permissions with checkboxes, not yes/no inputs

2016-03-22 17:18:43 +00:00

uploader.py

Give the user better error messages for CSV files

2016-03-08 18:36:22 +00:00

validators.py

Valid email domains added and tests passing.

2016-03-18 12:05:50 +00:00