Rebecca Law c99df69025 Merge branch 'master' into fix-permissions ...

Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py

2016-03-30 10:36:55 +01:00

..

__init__.py

109526036: Persist the verify code to the db.

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

test_accept_invite.py

Functionality added to existing endpoint without a user_has_permission decorator, tests passing.

2016-03-23 14:26:12 +00:00

test_add_service.py

Merge with master.

2016-03-29 22:50:40 +01:00

test_all_services.py

Added more test for the side nav

2016-03-21 15:36:47 +00:00

test_api_keys.py

Refactor unit test

2016-03-30 09:31:53 +01:00

test_choose_services.py

Merge branch 'master' into fix-permissions

2016-03-30 10:36:55 +01:00

test_code_not_received.py

In registration flow then request resend of sms should

2016-03-21 14:00:05 +00:00

test_dashboard.py

Refactor unit test

2016-03-30 09:31:53 +01:00

test_forgot_password.py

Should show the sent password reset link page when the user is not found.

2016-03-16 14:19:41 +00:00

test_headers.py

Add Google Analytics

2016-03-18 15:06:37 +00:00

test_index.py

All tests passing and merged with master.

2016-01-27 16:30:33 +00:00

test_jobs.py

Functionality added to existing endpoint without a user_has_permission decorator, tests passing.

2016-03-23 14:26:12 +00:00

test_manage_users.py

Merge branch 'master' into fix-permissions

2016-03-30 10:36:55 +01:00

test_new_password.py

Added a test to check that the password is updated when the password exists in the session object on the two-factor page.

2016-03-08 14:58:29 +00:00

test_register.py

merge with master

2016-03-18 12:07:50 +00:00

test_send.py

Merge branch 'master' into fix-permissions

2016-03-30 09:32:24 +01:00

test_service_settings.py

Remove unused method

2016-03-17 14:25:28 +00:00

test_sign_in.py

If user is pending it means they have not verified email yet

2016-03-29 13:12:06 +01:00

test_sign_out.py

Merge branch 'master' into platform-admin

2016-03-18 16:32:10 +00:00

test_styleguide.py

Tests added for dao.

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

test_templates.py

Add proper mocks for the test.

2016-03-30 08:41:07 +01:00

test_two_factor.py

The verify view was not passing along the next param to the two factor

2016-03-14 16:58:39 +00:00

test_user_profile.py

Changed registration flow to first send email verification link that

2016-03-17 15:19:51 +00:00

test_verify.py

Better flash message for users with active accounts who click on

2016-03-29 13:21:51 +01:00