Imdad Ahad f9b539d71e Fix conflict

2016-09-27 16:54:00 +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 refactor-send-tasks-into-shared-code

2016-09-23 09:54:53 +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

…

job

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

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

notifications

Fix conflict

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

organisation

…

provider_details

…

public_contracts

Add additionalProperties to links object

2016-09-21 09:47:50 +01:00

service

Fix conflict

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

spec

…

status

…

template

…

template_statistics

…

user

…

__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

…