Rebecca Law 402f55be23 Merge branch 'master' into platform-admin ...

Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py

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

..

__init__.py

…

test_accept_invite.py

Merge pull request #293 from alphagov/single-verify-code

2016-03-18 11:03:27 +00:00

test_add_service.py

Remove services_dao.insert_new_service.

2016-03-13 09:37:17 +00:00

test_api_keys.py

Initial test routes tests added.

2016-03-09 12:10:50 +00:00

test_choose_services.py

…

test_code_not_received.py

Fixing tests broken by bad revert

2016-03-18 11:46:17 +00:00

test_dashboard.py

Merge branch 'master' into platform-admin

2016-03-18 16:32:10 +00: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

Inline images in CSS

2016-02-22 13:39:02 +00:00

test_index.py

…

test_jobs.py

Notification history page added and pagination, tests all working.

2016-03-16 16:57:10 +00:00

test_manage_users.py

Completion of the platform admin user story.

2016-03-18 16:20:37 +00: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

Changed registration flow to first send email verification link that

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

test_send.py

Completion of the platform admin user story.

2016-03-18 16:20:37 +00:00

test_service_settings.py

Remove unused method

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

test_sign_in.py

Noticed that the api was being called when running the unit tests.

2016-03-11 11:47:21 +00:00

test_sign_out.py

Merge branch 'master' into platform-admin

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

test_styleguide.py

…

test_templates.py

Initial test routes tests added.

2016-03-09 12:10:50 +00: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

Unit test bug fix. Page structure change.

2016-03-18 11:20:08 +00:00