Martyn Inglis e3ed8fad1a Merge branch 'master' into research-mode-csv-file-queues ...

Conflicts:
	tests/app/celery/test_tasks.py
	tests/app/notifications/rest/test_send_notification.py

2016-09-30 11:07:32 +01:00

..

accept_invite

Fix codestyle

2016-09-12 16:41:48 +01:00

authentication

Improve the error message when the service id is not the right data type.

2016-09-23 11:07:49 +01:00

celery

Merge branch 'master' into research-mode-csv-file-queues

2016-09-30 11:07:32 +01:00

clients

Updated clients to have a more robust error handling

2016-09-22 17:18:05 +01:00

dao

Fix conflict

2016-09-27 16:54:00 +01:00

delivery

Tidied up pull request comments

2016-09-23 15:59:23 +01:00

events

…

invite

Rationalised the queues.

2016-09-26 12:35:59 +01:00

job

add statuses filter to GET /service/{}/job

2016-09-23 16:34:13 +01:00

notifications

Merge branch 'master' into research-mode-csv-file-queues

2016-09-30 11:07:32 +01:00

organisation

add GET /organisation and GET /organisation/id endpoints

2016-08-09 15:59:22 +01:00

provider_details

make tests run consistently

2016-07-25 09:47:38 +01:00

public_contracts

Contract tests mock the new deliver_email|sms tasks

2016-09-28 15:28:45 +01:00

service

Fix conflict

2016-09-27 16:54:00 +01:00

spec

Publish a Swagger specification

2016-06-29 12:07:32 +01:00

status

…

template

…

template_statistics

Removed print

2016-08-24 10:59:33 +01:00

user

Rationalised the queues.

2016-09-26 12:35:59 +01:00

__init__.py

…

conftest.py

Fix conflict

2016-09-27 16:54:00 +01:00

test_encryption.py

…

test_model.py

Update ServiceWhitelist to conform to new data model

2016-09-27 13:44:29 +01:00

test_schemas.py

Add details of API key to notifications

2016-09-23 14:44:15 +01:00

test_statsd_decorators.py

replace mock with unittest.mock

2016-08-31 12:39:11 +01:00