Rebecca Law cefa00b3fa Merge branch 'master' into fix-billable-units-query ...

Conflicts:
	tests/app/dao/test_notification_dao.py

2017-01-10 14:24:08 +00:00

..

accept_invite

Update the tests for the new text

2016-12-09 12:28:28 +00:00

authentication

Records the service ID if present, or if an ADMIN api call the string admin-api.

2016-11-30 10:59:55 +00:00

aws

…

celery

Merge pull request #775 from alphagov/do-not-write-test-data-to-the-history-table

2017-01-10 13:05:06 +00:00

clients

Log notification ID on deliver tasks and in clients.

2016-12-20 13:24:08 +00:00

dao

Merge branch 'master' into fix-billable-units-query

2017-01-10 14:24:08 +00:00

delivery

don't use cloudfront on preview or staging

2016-12-29 12:15:47 +00:00

events

…

invite

Two new methods needed to pass the service not the service ID into the create notifications methods.

2017-01-10 13:41:16 +00:00

job

…

notifications

Ensure updates on a research mode service or test key don't touch the history table

2016-12-19 16:45:18 +00:00

organisation

…

provider_details

add updated_at to provider_details

2016-12-19 17:45:46 +00:00

schema_validation

bump utils to 13.0.1

2017-01-09 16:37:58 +00:00

service

Refactor the get_detailed_services so that the start and end date are not defaulted to None.

2016-12-29 13:50:41 +00:00

spec

…

status

…

template

Update utils to 12.0.0

2016-12-13 10:57:01 +00:00

template_statistics

…

user

Two new methods needed to pass the service not the service ID into the create notifications methods.

2017-01-10 13:41:16 +00:00

v2

Merge pull request #775 from alphagov/do-not-write-test-data-to-the-history-table

2017-01-10 13:05:06 +00:00

__init__.py

Makes the app use the redis and statsd clients from utils

2016-12-01 17:20:05 +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

…

models.py

add updated_at to provider_details

2016-12-19 17:45:46 +00:00

schemas.py

bump utils to 13.0.1

2017-01-09 16:37:58 +00:00

statsd_decorators.py

…

utils.py

Update utils to 12.0.0

2016-12-13 10:57:01 +00:00

version.py.dist

…