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

Merge branch 'master' into active-service

2016-11-10 13:54:02 +00:00

celery

fix placeholders not appearing in email subject

2016-12-22 14:40:33 +00:00

clients

bump utils to 13.0.1

2017-01-09 16:37:58 +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

bump utils to 13.0.1

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

job

…

notifications

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

2017-01-10 13:05:06 +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

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

Remove old style fixture

2016-11-11 17:05:41 +00:00

template_statistics

Fix for missing template IDs.

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

user

bump utils to 13.0.1

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

v2

bump utils to 13.0.1

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

__init__.py

…

conftest.py

fix placeholders not appearing in email subject

2016-12-22 14:40:33 +00:00

test_encryption.py

…

test_model.py

Rewrite failed statuses

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

test_schemas.py

Refactor stuff + stricter validation for updating only ALLOWED user attrs

2016-11-10 13:09:25 +00:00

test_statsd_decorators.py

…

test_user_agent_processing.py

Statsd counter for user agents.

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