Rebecca Law 402f55be23 Merge branch 'master' into platform-admin ...

Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py

2016-03-18 16:32:10 +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-18 16:32:10 +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

Changed registration flow to first send email verification link that

2016-03-17 15:19:51 +00:00

uploader.py

Give the user better error messages for CSV files

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

validators.py

…