Martyn Inglis c437615661 Merge branch 'master' into fix-mocks ...

Conflicts:
	tests/app/notifications/test_validators.py

2016-11-29 13:32:40 +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 returning notifications by "?status=failed"

2016-11-25 15:26:40 +00:00

delivery

…

events

…

invite

Append "Z" to DATETIME_FORMAT

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

job

…

notifications

Merge branch 'master' into fix-mocks

2016-11-29 13:32:40 +00:00

organisation

…

provider_details

…

public_contracts

Add get_notifications json schema + tests

2016-11-25 16:50:20 +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 #749 from alphagov/pc-nab-numerous-notifications

2016-11-28 17:20:27 +00:00

__init__.py

…

conftest.py

Group 'completed' notification statuses

2016-11-25 15:23:04 +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

…