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 codestyle

2016-09-12 16:41:48 +01:00

authentication

Rewrite authentication error messages more English

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

celery

Remove provider_statistics_dao.get_provider_statistics

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

clients

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

dao

Exclude test key notifications from:

2016-09-16 13:47:09 +01:00

events

…

invite

…

job

Merge pull request #656 from alphagov/add-cancel-job-endpoint

2016-09-06 12:11:32 +01:00

notifications

Merge pull request #680 from alphagov/update-return-all-notifications-schema

2016-09-21 09:52:51 +01:00

organisation

add GET /organisation and GET /organisation/id endpoints

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

provider_details

make tests run consistently

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

public_contracts

Add additionalProperties to links object

2016-09-21 09:47:50 +01:00

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

Publish a Swagger specification

2016-06-29 12:07:32 +01:00

status

…

template

…

template_statistics

Removed print

2016-08-24 10:59:33 +01:00

user

pep8 fixes

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

__init__.py

…

conftest.py

Setup code for various key types and separated notifications made by CSV and by API into separate fixtures.

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

test_encryption.py

…

test_model.py

Adds a builder method to the notification object.

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

test_schemas.py

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

2016-09-15 15:59:34 +01:00

test_statsd_decorators.py

replace mock with unittest.mock

2016-08-31 12:39:11 +01:00