Rebecca Law 6394408228 Merge branch 'master' into email_from_uniqueness

2016-03-31 15:20:45 +01:00

..

notify_client

…

views

Merge branch 'master' into email_from_uniqueness

2016-03-31 15:20:45 +01:00

__init__.py

…

test_add_service_form.py

Update the service name validation in the ServiceNameForm and AddServiceForm to check the email_safe version

2016-03-31 15:17:05 +01:00

test_asset_fingerprinter.py

…

test_create_api_key_form.py

…

test_encyption.py

…

test_errorhandlers.py

…

test_errors_for_csv.py

…

test_permissions.py

Fix main_nav for platform admin

2016-03-30 11:30:18 +01: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