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 a bug in the accept invitation that was throwing a 500.

2016-09-12 16:16:02 +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

aws

Removed the 'delete job' tasks from the tasks.py file

2016-09-07 15:35:12 +01:00

celery

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

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

clients

Tidied up pull request comments

2016-09-23 15:59:23 +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

…

service

Refactor sending elegibility function and update across files

2016-09-28 17:00:17 +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

Rationalised the queues.

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

__init__.py

Implemented the REST endpoint to communicate with the new send-to-provider code

2016-09-22 14:01:25 +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

Fix conflict

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

schemas.py

Merge pull request #690 from alphagov/add-key-name-notifications

2016-09-26 08:41:02 +01:00

statsd_decorators.py

Refactor statsd logging

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

utils.py

add pagination to GET /service/{}/job

2016-09-21 16:54:02 +01:00

version.py.dist

Create Docker build image, build project with Docker

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