Rebecca Law bfea4a42bc Merge branch 'master' into cancel-invited-user ...

Conflicts:
	app/notify_client/invite_api_client.py
	tests/app/main/views/test_manage_users.py

2016-03-01 18:01:20 +00:00

..

notify_client

Renamed header of CSV to be 'to' - matches API

2016-02-25 11:30:09 +00:00

views

Merge branch 'master' into cancel-invited-user

2016-03-01 18:01:20 +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_phone_number_form_field.py

…

test_phone_validation.py

…

test_two_factor_form.py

…

test_user.py

…

test_utils.py

Slight (bad) hack to ensure that the ticks appear on the manage user page

2016-03-01 10:45:13 +00:00

test_validators.py

…

test_verify_form.py

…