Rebecca Law 4ba801edab Merge branch 'master' into error-handling ...

Conflicts:
	app/main/views/invites.py

2016-03-10 15:03:21 +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

…

code_not_received.py

…

dashboard.py

Handle HTTPError from API and routing errors from flask.

2016-03-10 14:56:47 +00:00

email.py

Add basic flow for adding email _or_ sms templates

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

forgot_password.py

Refactored register_errorhandlers so that it handles HTTPError

2016-03-10 11:53:29 +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

Merge branch 'master' into error-handling

2016-03-10 15:03:21 +00:00

jobs.py

Handle HTTPError from API and routing errors from flask.

2016-03-10 14:56:47 +00:00

manage_users.py

Merge branch 'master' into error-handling

2016-03-10 15:03:21 +00:00

new_password.py

Re-implement forgot password

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

register.py

Merge branch 'master' into error-handling

2016-03-10 15:03:21 +00:00

send.py

Refactored register_errorhandlers so that it handles HTTPError

2016-03-10 11:53:29 +00:00

service_settings.py

Merge branch 'master' into error-handling

2016-03-10 15:03:21 +00:00

sign_in.py

Display email address that invitee will be registered with.

2016-03-09 11:27:26 +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

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

…

verify.py

Refactored register_errorhandlers so that it handles HTTPError

2016-03-10 11:53:29 +00:00