Martyn Inglis 886b206d63 Merge branch 'master' into email-templates ...

Conflicts:
	app/user/rest.py
	tests/app/user/test_rest.py

2016-02-22 13:12:24 +00:00

..

authentication

bumped client version

2016-02-09 18:48:02 +00:00

celery

Merge branch 'celery-send-sms-code' into celery-send-email-code

2016-02-18 10:50:14 +00:00

clients

I have an issue with the test, not sure why?

2016-02-17 17:48:23 +00:00

dao

Fix all other dependant classes that are affected by the DAO / Service / Model changes

2016-02-19 15:54:11 +00:00

job

Wire up error handlers.

2016-02-17 17:04:50 +00:00

notifications

Wire up error handlers.

2016-02-17 17:04:50 +00:00

service

Generate the email_from from the service name.

2016-02-19 17:07:59 +00:00

status

…

template

Wire up error handlers.

2016-02-17 17:04:50 +00:00

user

Merge branch 'master' into email-templates

2016-02-22 13:12:24 +00:00

__init__.py

I have an issue with the test, not sure why?

2016-02-17 17:48:23 +00:00

aws_sqs.py

Return notification_id on create notification endpoints

2016-02-10 12:46:52 +00:00

encryption.py

Don't send the SMS if we have failed to save in the database

2016-02-16 17:42:04 +00:00

errors.py

Refactor user/<user_id>/code into two endpoints.

2016-02-19 11:37:35 +00:00

models.py

Merge branch 'master' into email-templates

2016-02-22 13:12:24 +00:00

schemas.py

Refactor user/<user_id>/code into two endpoints.

2016-02-19 11:37:35 +00:00

version.py

…