Rebecca Law 29ddad60e7 Merge branch 'master' into forgot-password ...

Conflicts:
	app/main/views/two_factor.py

2016-03-08 15:03:25 +00:00

..

__init__.py

…

_jobs.py

…

add_service.py

Flash message to confirm invitation accepted and user has been

2016-03-08 08:18:41 +00:00

api_keys.py

API keys hooked up and working. All tests passing.

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

choose_service.py

Move service and user nav to proposition header

2016-02-01 13:52:45 +00:00

code_not_received.py

Fix bug with send_verify_code not including the to field.

2016-02-22 12:33:59 +00:00

dashboard.py

Flash message to confirm invitation accepted and user has been

2016-03-08 08:18:41 +00:00

email.py

Add basic flow for adding email _or_ sms templates

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

forgot_password.py

Re-implement forgot password

2016-03-07 18:18:52 +00:00

index.py

[WIP] New user can now accept invite and will be made to

2016-03-02 17:52:32 +00:00

invites.py

Flash message to confirm invitation accepted and user has been

2016-03-08 08:18:41 +00:00

jobs.py

Make job page poll for updates

2016-03-03 14:28:36 +00:00

manage_users.py

Filter out accepted invites in template not client.

2016-03-07 13:59:54 +00:00

new_password.py

Re-implement forgot password

2016-03-07 18:18:52 +00:00

register.py

[WIP] New user can now accept invite and will be made to

2016-03-02 17:52:32 +00:00

send.py

Merge pull request #235 from alphagov/fix-bad-first-column

2016-03-04 11:38:57 +00:00

service_settings.py

Fix permission names, all tests passing.

2016-03-03 12:15:24 +00:00

sign_in.py

Remember me functionality added and tested.

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

sign_out.py

Remember me functionality added and tested.

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

styleguide.py

Slight (bad) hack to ensure that the ticks appear on the manage user page

2016-03-01 10:45:13 +00:00

templates.py

Merge with master.

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

two_factor.py

Merge branch 'master' into forgot-password

2016-03-08 15:03:25 +00:00

user_profile.py

Fix bug with send_verify_code not including the to field.

2016-02-22 12:33:59 +00:00

verify.py

[WIP] New user can now accept invite and will be made to

2016-03-02 17:52:32 +00:00