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

…

celery

Changed the timeout notications update query to set notifications still in created to a technical-failure and notifications still in sending or pending are set to a temporary-failure

2016-12-16 11:40:58 +00:00

clients

fix invalid logging

2016-12-19 17:13:10 +00:00

dao

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

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

delivery

Add robustness to our v2 schema error messages:

2016-12-15 16:39:15 +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

public_contracts

Add get_notifications json schema + tests

2016-11-25 16:50:20 +00:00

service

Add include_from_test_key parameter to /service

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

spec

…

status

…

template

…

template_statistics

Fix for missing template IDs.

2016-12-15 16:59:03 +00:00

user

Merge pull request #774 from alphagov/refactor-send_user_email_verification

2016-12-19 16:29:02 +00:00

v2

Merge pull request #772 from alphagov/fix-v2-uri

2016-12-16 15:53:26 +00:00

__init__.py

…

conftest.py

dont let user update prov details version, and refactor tests

2016-12-19 17:13:10 +00:00

test_encryption.py

…

test_model.py

Rewrite failed statuses

2016-11-25 15:23:46 +00:00

test_schemas.py

…

test_statsd_decorators.py

…

test_user_agent_processing.py

Statsd counter for user agents.

2016-11-25 13:27:36 +00:00