Martyn Inglis e6347d99bd Merge branch 'master' into stats-db-updates ...

Conflicts:
	tests/app/conftest.py

2016-08-03 11:46:40 +01:00

..

authentication

Fix bug with expired token error response

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

celery

Statsd timings were being passed a timedelta instead for float for

2016-07-22 12:13:24 +01:00

clients

Moved mmg_url to configs.

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

dao

Merge branch 'master' into stats-db-updates

2016-08-03 11:46:40 +01:00

events

…

invite

…

job

ensure /notifications rather than service/:id/notifications in tests

2016-07-26 15:09:25 +01:00

notifications

ensure /notifications rather than service/:id/notifications in tests

2016-07-26 15:09:25 +01:00

provider_details

make tests run consistently

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

service

use freeze_time whenever we mess with dates

2016-08-02 11:02:59 +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

…

template_statistics

…

user

Fix indentation

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

__init__.py

…

conftest.py

Merge branch 'master' into stats-db-updates

2016-08-03 11:46:40 +01:00

test_encryption.py

…

test_schemas.py

…