Rebecca Law c6df84a8f3 Merge branch 'master' into do-not-write-test-data-to-the-history-table ...

Conflicts:
	app/dao/notifications_dao.py

2016-12-21 09:57:17 +00:00

..

accept_invite

Update the tests for the new text

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

authentication

…

aws

…

celery

Merge branch 'master' into do-not-write-test-data-to-the-history-table

2016-12-21 09:57:17 +00:00

clients

…

dao

Merge branch 'master' into do-not-write-test-data-to-the-history-table

2016-12-21 09:57:17 +00:00

delivery

Update utils to 12.0.0

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

events

…

invite

…

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

Add comment for e.path schema validation fix

2016-12-16 12:41:19 +00:00

service

Add include_from_test_key parameter to /service

2016-12-05 17:50:52 +00:00

spec

…

status

…

template

Update utils to 12.0.0

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

template_statistics

…

user

Ensure that all persist notification methods use service not service ID

2016-12-19 16:51:57 +00:00

v2

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

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

__init__.py

…

aws_sqs.py

…

commands.py

…

encryption.py

…

errors.py

…

history_meta.py

…

models.py

add updated_at to provider_details

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

schemas.py

Update utils to 12.0.0

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

statsd_decorators.py

…

utils.py

Update utils to 12.0.0

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

version.py.dist

…