Martyn Inglis 7cfc58c994 Merge branch 'master' into caching-with-redis ...

Conflicts:
	app/celery/tasks.py
	tests/app/celery/test_tasks.py

2016-11-21 13:10:22 +00:00

..

accept_invite

Fix a bug in the accept invitation that was throwing a 500.

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

authentication

Merge pull request #723 from alphagov/active-service

2016-11-11 15:25:32 +00:00

aws

…

celery

Merge branch 'master' into caching-with-redis

2016-11-21 13:10:22 +00:00

clients

Merge branch 'master' into caching-with-redis

2016-11-21 13:10:22 +00:00

dao

don't re-delete already archived/revoked templates/api-keys

2016-11-14 14:10:40 +00: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 caching-with-redis

2016-11-21 13:10:22 +00:00

organisation

…

provider_details

…

schema_validation

Remove import

2016-11-11 10:56:21 +00:00

service

Merge pull request #723 from alphagov/active-service

2016-11-11 15:25:32 +00:00

spec

…

status

…

template

…

template_statistics

…

user

Use POST endpoint for updating a user attr

2016-11-10 12:07:29 +00:00

v2

Update format of the errors for DataError and exception

2016-11-10 14:53:39 +00:00

__init__.py

Added tests for setting and fetching from redis respecting the enabled flag.

2016-11-10 13:22:38 +00:00

aws_sqs.py

…

commands.py

…

encryption.py

…

errors.py

update V2 error response to

2016-11-09 14:56:54 +00:00

history_meta.py

…

models.py

Remove from_request method on the Notification db model, was not needed anymore.

2016-11-14 14:41:32 +00:00

schemas.py

Remove redundant assignment

2016-11-11 16:47:06 +00:00

statsd_decorators.py

…

utils.py

Rename the endpoints.

2016-10-13 11:59:47 +01:00

version.py.dist

…