Nicholas Staples 48daac7b94 Merging conflict with two_factor.py ...

Fixed merge mistake with two_factor.py.

2016-03-30 10:11:06 +01:00

..

__init__.py

…

_jobs.py

…

add_service.py

Merge with master.

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

all_services.py

Merge with master.

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

api_keys.py

Move documentation into footer, not behind login

2016-03-21 10:39:57 +00:00

choose_service.py

Merge with master.

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

code_not_received.py

In registration flow then request resend of sms should

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

dashboard.py

Merge with master.

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

email.py

Add basic flow for adding email _or_ sms templates

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

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

index.py

Add Terms of use page

2016-03-23 10:26:21 +00:00

invites.py

Merge with master.

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

jobs.py

Merge with master.

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

manage_users.py

Merge with master.

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

new_password.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

register.py

Changed registration flow to first send email verification link that

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

send.py

Merge with master.

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

service_settings.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

sign_in.py

Merge with master.

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

sign_out.py

Remember me functionality added and tested.

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

styleguide.py

Set permissions with checkboxes, not yes/no inputs

2016-03-22 17:18:43 +00:00

templates.py

Merge with master.

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

two_factor.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

user_profile.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

verify.py

Better flash message for users with active accounts who click on

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