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

…

_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

…

code_not_received.py

…

dashboard.py

Remove placeholder logs of notifications sent

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

forgot_password.py

…

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

…

register.py

Verify activate and login user with sms and email code

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

service_settings.py

…

sign_in.py

First slice full sign in flow

2016-01-21 11:33:53 +00:00

sign_out.py

…

sms.py

Merge with master.

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

styleguide.py

…

templates.py

Mapped template actions to the api and mocked tests.

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

two_factor.py

…

user_profile.py

…

verify.py

Verify activate and login user with sms and email code

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