Rebecca Law e8d5a9292a Merge branch 'master' into integrate_MMG ...

Conflicts:
	app/notifications/rest.py

2016-04-06 14:58:13 +01:00

..

authentication

Format authentication error messages for the client.

2016-03-14 15:51:04 +00:00

celery

Merge branch 'master' into integrate_MMG

2016-04-06 14:58:13 +01:00

clients

Add process_mmg_responses

2016-04-06 14:31:33 +01:00

dao

Successful notifications are deleted after a week now. All tests passing.

2016-04-05 11:07:21 +01:00

invite

Replaced first queries with one queries, which throws a NoResultFound.

2016-03-11 15:34:20 +00:00

job

Changed db queries to use one, which throws NoResultFound exception, this exception is dealt with in our error handlers.

2016-03-11 12:39:55 +00:00

notifications

Merge branch 'master' into integrate_MMG

2016-04-06 14:58:13 +01:00

permissions

…

service

Added some more tests.

2016-04-01 13:42:11 +01:00

template

The admin app now sends the email from when creating a service and when updating the service name.

2016-03-31 17:46:18 +01:00

template_statistics

Corrected error message format

2016-04-04 14:51:56 +01:00

user

Added task for sending email verification links out on intial

2016-03-17 15:21:04 +00:00

__init__.py

SES Callback testing

2016-03-14 14:49:02 +00:00

conftest.py

Remove csv after process job is finished.

2016-04-05 14:55:03 +01:00

test_encryption.py

…