Rebecca Law bfea4a42bc Merge branch 'master' into cancel-invited-user ...

Conflicts:
	app/notify_client/invite_api_client.py
	tests/app/main/views/test_manage_users.py

2016-03-01 18:01:20 +00:00

..

__init__.py

109526036: Persist the verify code to the db.

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

test_accept_invite.py

[WIP] Post does not need any data

2016-03-01 17:23:23 +00:00

test_add_service.py

Reword the add service page

2016-02-26 13:17:58 +00:00

test_api_keys.py

API keys hooked up and working. All tests passing.

2016-02-29 14:57:07 +00:00

test_choose_services.py

Add mocked get_services to test_client.login

2016-02-05 15:11:44 +00:00

test_code_not_received.py

All tests passing and merged with master.

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

test_dashboard.py

Updates to display of jobs

2016-02-04 10:59:03 +00:00

test_forgot_password.py

Stop enumeration of email addresses via forgot pw

2016-02-17 10:42:15 +00:00

test_headers.py

Inline images in CSS

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

test_index.py

All tests passing and merged with master.

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

test_jobs.py

Consolidate page templates for emails + texts

2016-02-26 11:57:13 +00:00

test_manage_users.py

Merge branch 'master' into cancel-invited-user

2016-03-01 18:01:20 +00:00

test_new_password.py

Tidy up inconsistencies in forms

2016-02-01 16:55:46 +00:00

test_register.py

All tests passing and merged with master.

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

test_send.py

Merge from master

2016-02-26 12:11:55 +00:00

test_service_settings.py

Review usage of secondary/back links

2016-02-05 10:43:49 +00:00

test_sign_in.py

Remember me functionality added and tested.

2016-02-24 17:32:15 +00:00

test_sign_out.py

Remember me functionality added and tested.

2016-02-24 17:32:15 +00:00

test_styleguide.py

Tests added for dao.

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

test_templates.py

Add basic flow for adding email _or_ sms templates

2016-02-24 09:23:38 +00:00

test_two_factor.py

Remember me functionality added and tested.

2016-02-24 17:32:15 +00:00

test_user_profile.py

Fix for forgot my password.

2016-01-27 18:01:43 +00:00

test_verify.py

Fix wording

2016-02-02 15:59:41 +00:00