Adam Shimali bfd7291426 resolve merge conflicts

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

..

__init__.py

Updated generate_token to use encrypt the entire url.

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

_jobs.py

Make data consistent from dashboard -> job

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

add_service.py

Move and rename macro.html

2016-01-04 15:50:26 +00:00

code_not_received.py

Updated generate_token to use encrypt the entire url.

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

dashboard.py

Logout functionality and test added.

2016-01-06 16:40:38 +00:00

forgot_password.py

Updated generate_token to use encrypt the entire url.

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

index.py

Fix code style. Remove duplicate endpoints

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

jobs.py

Unicoded the £ sign and the ' needed to render the job page.

2016-01-06 13:22:15 +00:00

new_password.py

Updated generate_token to use encrypt the entire url.

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

register.py

Updated generate_token to use encrypt the entire url.

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

service_settings.py

Add a WTForms-compatible textbox macro

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

sign_in.py

Updated generate_token to use encrypt the entire url.

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

sign_out.py

Update sign_out to go to the index page not sign-in

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

sms.py

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

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

styleguide.py

Add a WTForms-compatible textbox macro

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

templates.py

Add a WTForms-compatible textbox macro

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

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

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