Rebecca Law 46e0e3fd1b Merge branch 'master' into api-keys-flow ...

Conflicts:
	tests/app/main/views/test_api_keys.py

2016-01-21 15:50:00 +00:00

..

__init__.py

Updated generate_token to use encrypt the entire url.

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

_jobs.py

…

_templates.py

Make SMS templates plausible for hack day

2016-01-20 13:12:21 +00:00

add_service.py

Work in progress.

2016-01-20 11:46:39 +00:00

api_keys.py

Added a validator so that the key name is unique per service.

2016-01-21 14:15:36 +00:00

choose_service.py

Added choose_service using services_dao.

2016-01-18 11:15:14 +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

Remove placeholder logs of notifications sent

2016-01-19 12:04:18 +00:00

forgot_password.py

Updated generate_token to use encrypt the entire url.

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

index.py

Merge with master.

2016-01-19 09:49:01 +00:00

jobs.py

Remove placeholder logs of notifications sent

2016-01-19 12:04:18 +00:00

new_password.py

Updated generate_token to use encrypt the entire url.

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

register.py

Verify activate and login user with sms and email code

2016-01-20 15:34:42 +00:00

service_settings.py

Working service integration.

2016-01-18 17:35:28 +00:00

sign_in.py

First slice full sign in flow

2016-01-21 11:33:53 +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

Merge with master.

2016-01-19 09:49:01 +00:00

styleguide.py

Add a WTForms-compatible textbox macro

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

templates.py

Mapped template actions to the api and mocked tests.

2016-01-19 15:54:12 +00:00

two_factor.py

Use 🐍 case in function names

2016-01-14 11:12:03 +00:00

user_profile.py

Work in progress, all tests passing and implemented mocks for services_dao.

2016-01-15 17:46:09 +00:00

verify.py

Verify activate and login user with sms and email code

2016-01-20 15:34:42 +00:00