Martyn Inglis 137aa1e2d2 Merge branch 'master' into refactor-send-tasks-into-shared-code ...

Conflicts:
	app/celery/provider_tasks.py
	tests/app/celery/test_provider_tasks.py

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

Rewrite authentication error messages more English

2016-09-16 08:57:55 +01:00

aws

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

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

celery

Updated clients to have a more robust error handling

2016-09-22 17:18:05 +01:00

clients

Updated clients to have a more robust error handling

2016-09-22 17:18:05 +01:00

dao

Merge branch 'master' into remove-provider_statistics

2016-09-22 11:20:19 +01:00

delivery

Merge branch 'master' into refactor-send-tasks-into-shared-code

2016-09-23 09:54:53 +01:00

events

…

invite

…

job

Add an endpoint to cancel a job

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

notifications

Merge pull request #677 from alphagov/no-jobs-on-api-get

2016-09-19 12:31:04 +01:00

organisation

add GET /organisation and GET /organisation/id endpoints

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

provider_details

…

service

Optionally get only notifications created by API

2016-09-22 11:17:46 +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

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

Changed as per @chs comment. Using cls based not explicity calling type

2016-09-08 09:21:32 +01:00

schemas.py

New field on GET /notifications to allow users to request CSV data

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