Martyn Inglis 2a2ef34339 Merge branch 'master' into caching-with-redis ...

Conflicts:
	app/__init__.py

2016-11-23 09:12:11 +00:00

..

accept_invite

…

authentication

Merge branch 'master' into active-service

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

celery

Merge branch 'master' into caching-with-redis

2016-11-23 09:12:11 +00:00

clients

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

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

dao

Test can create letters template

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

delivery

…

events

…

invite

Append "Z" to DATETIME_FORMAT

2016-11-21 15:59:10 +00:00

job

Let jobs be scheduled up to 96 hours in the future

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

notifications

Fixed merge conflicts

2016-11-22 13:10:12 +00:00

organisation

…

provider_details

…

public_contracts

Add contract test for 'v2' email notification

2016-11-22 13:40:55 +00:00

service

don't re-delete already archived/revoked templates/api-keys

2016-11-14 14:10:40 +00:00

spec

…

status

…

template

Remove old style fixture

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

template_statistics

…

user

Append "Z" to DATETIME_FORMAT

2016-11-21 15:59:10 +00:00

v2

Merge pull request #741 from alphagov/fix-v2-post-notification

2016-11-22 16:28:13 +00:00

__init__.py

…

conftest.py

Add .cost() to notification model

2016-11-18 17:50:39 +00:00

test_encryption.py

…

test_model.py

Add .cost() to notification model

2016-11-18 17:50:39 +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

…