Martyn Inglis e7a01e979b Fixed merge conflicts

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

..

accept_invite

…

authentication

Merge branch 'master' into active-service

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

celery

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

2016-11-22 12:53:20 +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

Update error message for invalid email addresses

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

job

…

notifications

Fixed merge conflicts

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

organisation

…

provider_details

…

public_contracts

…

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

Merge pull request #725 from alphagov/update-user-profile-endpoints

2016-11-11 11:24:31 +00:00

v2

Remove print stmt and added assert error content

2016-11-17 14:02:44 +00:00

__init__.py

…

conftest.py

Test can get letter template

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

test_encryption.py

…

test_model.py

Remove from_request method on the Notification db model, was not needed anymore.

2016-11-14 14:41:32 +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

…