Adam Shimali bfd7291426 resolve merge conflicts

2016-01-12 10:43:23 +00:00

..

__init__.py

109526036: Persist the verify code to the db.

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

test_add_service.py

Take out the Canadian politeness.

2016-01-11 12:23:08 +00:00

test_code_not_received.py

Fix for security hole with setting session['user_id'] before second factor of authentication has been authorised.

2016-01-07 12:43:10 +00:00

test_dashboard.py

Fix for security hole with setting session['user_id'] before second factor of authentication has been authorised.

2016-01-07 12:43:10 +00:00

test_forgot_password.py

Updated generate_token to use encrypt the entire url.

2016-01-11 15:18:37 +00:00

test_headers.py

Add some useful owasp suggested headers

2016-01-07 13:58:38 +00:00

test_jobs.py

Make data consistent from dashboard -> job

2016-01-05 13:31:54 +00:00

test_new_password.py

Updated generate_token to use encrypt the entire url.

2016-01-11 15:18:37 +00:00

test_register.py

Take out the Canadian politeness.

2016-01-11 12:23:08 +00:00

test_service_settings.py

Make wording on 2nd-level pages match prev. commit

2016-01-08 17:17:34 +00:00

test_sign_in.py

Refactor for code_not_received, sign_in, two_factor and verify.

2016-01-05 17:08:50 +00:00

test_sign_out.py

When the user request a reset password link, the user.state is set to request_password_reset.

2016-01-11 12:23:08 +00:00

test_sms.py

First slice of csv upload of phone numbers for sending messages.

2016-01-11 15:00:51 +00:00

test_styleguide.py

Add a styleguide page

2016-01-11 14:27:31 +00:00

test_templates.py

Add routing and pages for managing templates

2016-01-06 09:39:42 +00:00

test_two_factor.py

Fix for security hole with setting session['user_id'] before second factor of authentication has been authorised.

2016-01-07 12:43:10 +00:00

test_verify.py

Fix for security hole with setting session['user_id'] before second factor of authentication has been authorised.

2016-01-07 12:43:10 +00:00