Martyn Inglis 8b9319ac7a Merge branch 'master' into scheduled-delivery-of-jobs ...

Conflicts:
	app/dao/jobs_dao.py
	tests/app/dao/test_jobs_dao.py
	tests/app/job/test_rest.py

2016-08-25 14:53:00 +01:00

..

authentication

Fix bug with expired token error response

2016-07-22 15:10:37 +01:00

celery

Added new scheduled task

2016-08-24 17:03:56 +01:00

clients

Moved mmg_url to configs.

2016-07-20 10:40:50 +01:00

dao

Merge branch 'master' into scheduled-delivery-of-jobs

2016-08-25 14:53:00 +01:00

events

…

invite

…

job

Merge branch 'master' into scheduled-delivery-of-jobs

2016-08-25 14:53:00 +01:00

notifications

Merge branch 'master' into scheduled-delivery-of-jobs

2016-08-25 14:53:00 +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

service

still return service if they have never sent any notifications

2016-08-24 15:00:51 +01:00

spec

Publish a Swagger specification

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

status

Only send to the provider if the notification has a created status.

2016-06-27 14:47:20 +01:00

template

Remove wrapper around response object

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

template_statistics

Removed print

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

user

Fix indentation

2016-07-12 10:45:47 +01:00

__init__.py

…

conftest.py

Setup code for tests for scheduled jobs.

2016-08-24 16:24:55 +01:00

test_encryption.py

…

test_schemas.py

…

test_statsd_decorators.py

Refactor statsd logging

2016-08-05 10:44:43 +01:00