Martyn Inglis 8669a169eb Merge branch 'master' into primary-provider ...

Conflicts:
	app/dao/notifications_dao.py
	app/dao/provider_statistics_dao.py
	app/schemas.py
	tests/app/conftest.py

2016-05-10 09:13:02 +01:00

..

authentication

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

celery

Ensure that the primary provider is used in all tasks

2016-05-10 09:04:22 +01:00

clients

Update mmg responses so that 3 is success.

2016-04-20 14:29:31 +01:00

dao

Merge branch 'master' into primary-provider

2016-05-10 09:13:02 +01:00

events

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

invite

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

job

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

notifications

Group by Notification Statistics added and all tests working.

2016-05-05 11:04:20 +01:00

permissions

Purge functional tests command added with passing test.

2016-05-06 11:16:30 +01:00

provider_details

Ensure that the primary provider is used in all tasks

2016-05-10 09:04:22 +01:00

service

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

status

Add delivery status endpoint

2016-04-29 13:00:21 +01:00

template

Get all versions for a template endpoint added.

2016-05-09 15:59:34 +01:00

template_statistics

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

user

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

__init__.py

SES Callback testing

2016-03-14 14:49:02 +00:00

conftest.py

Merge branch 'master' into primary-provider

2016-05-10 09:13:02 +01:00

test_encryption.py

…