Martyn Inglis 0c7d9e33aa Merge branch 'master' into caching-with-redis ...

Conflicts:
	tests/app/notifications/test_process_notification.py

2016-11-22 13:00:37 +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

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

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

celery

Pushed the cache increment into the shared code that persists notifications.

2016-11-22 12:53:20 +00:00

clients

Pushed the cache increment into the shared code that persists notifications.

2016-11-22 12:53:20 +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

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

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-22 13:00:37 +00:00

organisation

add GET /organisation and GET /organisation/id endpoints

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

provider_details

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

schema_validation

Remove print stmt and added assert error content

2016-11-17 14:02:44 +00:00

service

Merge pull request #723 from alphagov/active-service

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

spec

calculate billable units when sending an sms

2016-08-03 16:46:05 +01:00

status

…

template

Update utils for Markdown parsing + subbranding

2016-07-22 11:09:23 +01:00

template_statistics

Changed template stats for template id

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

user

Use POST endpoint for updating a user attr

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

v2

Merge branch 'master' into caching-with-redis

2016-11-22 13:00:37 +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

Now that we have discovered that the catch all Exception handler doesn't work, I've created a custom exception (SendNotificationQueueError) that handles this case and an error handler for it.

2016-11-21 15:11:19 +00:00

history_meta.py

pep8 fixes

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

models.py

Create new column in notifications and notification_history to store the client_reference because I remembered that reference is used for email providers.

2016-11-17 13:42:34 +00:00

schemas.py

Remove redundant assignment

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

statsd_decorators.py

Refactor statsd logging

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

utils.py

Rename the endpoints.

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

version.py.dist

Create Docker build image, build project with Docker

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