Rebecca Law fcf277c413 Merge branch 'master' into template_history_view ...

Conflicts:
	requirements.txt

2016-05-13 17:30:33 +01:00

..

notify_client

Record login including remembered user login events to the api based of flask login

2016-04-27 16:39:17 +01:00

views

Merge branch 'master' into template_history_view

2016-05-13 17:30:33 +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_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

Fix innacurate error message on CSV check

2016-04-18 11:47:53 +01:00

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

Fix missing request context in validators tests

2016-04-25 11:20:43 +01:00