Rebecca Law 4ba801edab Merge branch 'master' into error-handling ...

Conflicts:
	app/main/views/invites.py

2016-03-10 15:03:21 +00:00

..

notify_client

Filter out accepted invites in template not client.

2016-03-07 13:59:54 +00:00

views

Merge branch 'master' into error-handling

2016-03-10 15:03:21 +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_errors_for_csv.py

Give the user better error messages for CSV files

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

test_permissions.py

Tests added for choose_template page.

2016-03-09 13:55:40 +00:00

test_two_factor_form.py

…

test_user.py

…

test_validators.py

…

test_verify_form.py

…