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

..

notify_client

Add API client for notification statistic

2016-03-17 13:15:41 +00:00

views

Merge branch 'master' into platform-admin

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

__init__.py

…

test_add_service_form.py

Reword the add service page

2016-02-26 13:17:58 +00:00

test_asset_fingerprinter.py

…

test_create_api_key_form.py

…

test_encyption.py

…

test_errorhandlers.py

Removed test as it was not testing the right thing

2016-03-11 10:47:16 +00:00

test_errors_for_csv.py

Give the user better error messages for CSV files

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

test_permissions.py

Completion of the platform admin user story.

2016-03-18 16:20:37 +00:00

test_two_factor_form.py

…

test_user.py

…

test_validators.py

Valid email domains added and tests passing.

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