Rebecca Law 402f55be23 Merge branch 'master' into platform-admin ...

Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py

2016-03-18 16:32:10 +00:00

..

__init__.py

…

_jobs.py

…

add_service.py

Merge branch 'master' into platform-admin

2016-03-18 16:32:10 +00:00

all_services.py

A platform admin user is able to see a list of all services.

2016-03-17 10:46:47 +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

Changed registration flow to first send email verification link that

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

dashboard.py

Fix division by zero

2016-03-17 14:40:08 +00: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 a help page that explains trial mode

2016-03-17 14:52:34 +00:00

invites.py

Changed registration flow to first send email verification link that

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

jobs.py

A platform admin user is able to see a list of all services.

2016-03-17 10:46:47 +00:00

manage_users.py

Merge branch 'master' into platform-admin

2016-03-18 16:32:10 +00:00

new_password.py

Re-implement forgot password

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

register.py

Changed registration flow to first send email verification link that

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

send.py

Completion of the platform admin user story.

2016-03-18 16:20:37 +00:00

service_settings.py

A platform admin user is able to see a list of all services.

2016-03-17 10:46:47 +00:00

sign_in.py

Changed registration flow to first send email verification link that

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

sign_out.py

Remember me functionality added and tested.

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

styleguide.py

Added error message on template for failing to choose permissions.

2016-03-09 17:42:47 +00:00

templates.py

A platform admin user is able to see a list of all services.

2016-03-17 10:46:47 +00:00

two_factor.py

[WIP]: fixing unit tests

2016-03-18 10:49:22 +00:00

user_profile.py

Changed registration flow to first send email verification link that

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

verify.py

Changed registration flow to first send email verification link that

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