Rebecca Law 30dd602dfb Merge branch 'master' into remove-provider_statistics ...

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

2016-09-22 11:20:19 +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

Remove provider_statistics_dao.get_provider_statistics

2016-09-19 17:24:26 +01:00

clients

Format the stat name with environmenbt

2016-09-14 15:22:50 +01:00

dao

Merge branch 'master' into remove-provider_statistics

2016-09-22 11:20:19 +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

Ensure GET /notifications/ by service ID returns CSV and API data - used by ADMIN console.

2016-09-15 16:00:46 +01:00

spec

…

status

…

template

…

template_statistics

Changed template stats for template id

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

user

…

__init__.py

Simplified the config. Aim is to get the actual secrets in credstash to be env specific, and not the random collection of things we have at the moment.

2016-09-07 09:35:31 +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

…

utils.py

…

version.py.dist

Create Docker build image, build project with Docker

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