Martyn Inglis b4d40dcd18 Merge branch 'master' into write-to-postgres-not-sqs ...

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

2016-09-08 09:15:07 +01:00

..

accept_invite

…

authentication

Fix bug with expired token error response

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

aws

…

celery

Merge branch 'master' into write-to-postgres-not-sqs

2016-09-07 13:51:21 +01:00

clients

Update mmg status code 2 to be a permanent failure.

2016-09-01 10:23:37 +01:00

dao

Make indentation consistent

2016-09-02 23:22:15 +01:00

events

…

invite

…

job

Add an endpoint to cancel a job

2016-09-02 12:27:02 +01:00

notifications

Merge branch 'master' into write-to-postgres-not-sqs

2016-09-08 09:15:07 +01:00

organisation

add GET /organisation and GET /organisation/id endpoints

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

provider_details

…

service

still return service if they have never sent any notifications

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

spec

calculate billable units when sending an sms

2016-08-03 16:46:05 +01:00

status

…

template

…

template_statistics

Changed template stats for template id

2016-08-22 14:35:04 +01:00

user

…

__init__.py

rename service to service_blueprint

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

aws_sqs.py

…

commands.py

…

encryption.py

…

errors.py

…

history_meta.py

pep8 fixes

2016-08-23 12:05:47 +01:00

models.py

Adds a builder method to the notification object.

2016-09-07 13:44:56 +01:00

schemas.py

Remove outdated comment

2016-08-31 10:39:25 +01:00

statsd_decorators.py

Refactor statsd logging

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

utils.py

…

version.py.dist

Create Docker build image, build project with Docker

2016-08-22 17:25:41 +01:00