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

tests for send_sms through mmg/firetext

2016-06-01 15:59:44 +01:00

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

Add a limit days query param for get all jobs.

2016-05-24 17:21:04 +01:00

notifications

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

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

provider_details

Load testing client added

2016-05-12 10:46:35 +01:00

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

fix template api tests being inconsistent by adding ordering

2016-06-09 11:24:04 +01:00

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

add test file for schemas

2016-06-10 16:34:20 +01:00