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

..

notify_client

Add API client for notification statistic

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

views

Merge branch 'master' into fix-permissions

2016-03-30 10:36:55 +01: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

Added more test for the side nav

2016-03-21 15:36:47 +00:00

test_two_factor_form.py

Merging conflict with two_factor.py

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

test_user.py

…

test_validators.py

Merging conflict with two_factor.py

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