Martyn Inglis 7cfc58c994 Merge branch 'master' into caching-with-redis ...

Conflicts:
	app/celery/tasks.py
	tests/app/celery/test_tasks.py

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

..

accept_invite

Fix codestyle

2016-09-12 16:41:48 +01:00

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-21 13:10:22 +00:00

clients

Couple of bugs squashed.

2016-11-12 15:37:57 +00:00

dao

Test can create letters template

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

delivery

Tidied up pull request comments

2016-09-23 15:59:23 +01:00

events

…

invite

Update error message for invalid email addresses

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

job

Let jobs be scheduled up to 96 hours in the future

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

notifications

Merge branch 'master' into caching-with-redis

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

organisation

…

provider_details

…

public_contracts

Contract tests mock the new deliver_email|sms tasks

2016-09-28 15:28:45 +01: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

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

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

v2

Change validation error message to a string from a dict.

2016-11-10 16:30:51 +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

replace mock with unittest.mock

2016-08-31 12:39:11 +01:00