Rebecca Law 6c81d0f465 Merge branch 'master' into move-scheduler-tasks ...

Conflicts:
	tests/app/celery/test_tasks.py

2016-06-21 11:24:26 +01:00

..

accept_invite

…

authentication

Update auth module to return consistently formed error messages.

2016-06-17 14:22:58 +01:00

aws

…

celery

Merge branch 'master' into move-scheduler-tasks

2016-06-21 11:24:26 +01:00

clients

…

dao

Merge branch 'master' into split-sms-and-retry

2016-06-17 16:39:03 +01:00

events

…

invite

Use the send email task to send the password reset and invitation email.

2016-06-16 17:34:33 +01:00

job

…

notifications

Template and personalisation content is now merged and returned with

2016-06-20 16:49:17 +01:00

notifications_statistics

Endpoint for reading notification stats for a given day.

2016-06-16 17:02:33 +01:00

provider_details

…

service

…

status

…

template

Remove wrapper around response object

2016-06-17 12:57:43 +01:00

template_statistics

…

user

Remove print

2016-06-17 11:01:26 +01:00

__init__.py

…

aws_sqs.py

…

commands.py

…

encryption.py

…

errors.py

…

history_meta.py

…

models.py

Template and personalisation content is now merged and returned with

2016-06-20 16:49:17 +01:00

schemas.py

Template and personalisation content is now merged and returned with

2016-06-20 16:49:17 +01:00

version.py

…