Rebecca Law 11ac7b2874 Merge branch 'master' into notification-created-status ...

Conflicts:
	app/dao/notifications_dao.py

2016-06-22 16:15:56 +01:00

..

authentication

Refactor the api_key_dao.

2016-06-22 15:27:28 +01:00

celery

The send_sms task will created the notification with a status = created.

2016-06-22 13:32:27 +01:00

clients

…

dao

Merge branch 'master' into notification-created-status

2016-06-22 16:15:56 +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

The send_sms task will created the notification with a status = created.

2016-06-22 13:32:27 +01:00

provider_details

…

service

Refactor the api_key_dao.

2016-06-22 15:27:28 +01:00

status

…

template

Remove wrapper around response object

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

template_statistics

…

user

remove print in test

2016-06-21 11:28:18 +01:00

__init__.py

…

conftest.py

Template and personalisation content is now merged and returned with

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

test_encryption.py

…

test_schemas.py

…