Rebecca Law 46e0e3fd1b Merge branch 'master' into api-keys-flow ...

Conflicts:
	tests/app/main/views/test_api_keys.py

2016-01-21 15:50:00 +00:00

..

__init__.py

109526036: Persist the verify code to the db.

2015-12-10 14:48:01 +00:00

test_add_service.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_api_keys.py

Merge branch 'master' into api-keys-flow

2016-01-21 15:50:00 +00:00

test_choose_services.py

Verify activate and login user with sms and email code

2016-01-20 15:34:42 +00:00

test_code_not_received.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_dashboard.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_forgot_password.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_headers.py

Tests added for dao.

2016-01-15 15:15:35 +00:00

test_jobs.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_new_password.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_register.py

some tests fixed

2016-01-21 12:12:06 +00:00

test_service_settings.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_sign_in.py

Fixed some tests. Some broken mocked tests commented out until later

2016-01-21 12:31:09 +00:00

test_sign_out.py

Fixed some tests. Some broken mocked tests commented out until later

2016-01-21 12:31:09 +00:00

test_sms.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_styleguide.py

Tests added for dao.

2016-01-15 15:15:35 +00:00

test_templates.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_two_factor.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

test_user_profile.py

Tests added for dao.

2016-01-15 15:15:35 +00:00

test_verify.py

Temporarily comment out tests that are timing out until mocking sorted

2016-01-20 17:24:17 +00:00