Rebecca Law 8ab4a5b150 Merge branch 'master' into platform-admin ...

Conflicts:
	tests/app/main/views/test_dashboard.py

2016-03-21 13:23:46 +00:00

..

dao

Merge branch 'master' into platform-admin

2016-03-18 16:32:10 +00:00

notifications

…

views

Merge branch 'master' into platform-admin

2016-03-21 13:23:46 +00: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

merge with master

2016-03-18 12:07:50 +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