Martyn Inglis 1ff4ebad5c Merge branch 'master' into client-callbacks ...

Conflicts:
	app/notifications/rest.py
	tests/app/celery/test_tasks.py

2016-03-14 11:45:21 +00:00

..

authentication

Fix all other dependant classes that are affected by the DAO / Service / Model changes

2016-02-19 15:54:11 +00:00

celery

Merge branch 'master' into client-callbacks

2016-03-14 11:45:21 +00:00

dao

Merge branch 'master' into client-callbacks

2016-03-14 11:45:21 +00: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 client-callbacks

2016-03-14 11:45:21 +00:00

permissions

Fix all tests.

2016-03-02 11:10:52 +00:00

service

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

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

template

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

user

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

__init__.py

Endpoint to allow SES updates to occur

2016-03-10 17:29:17 +00:00

conftest.py

Update notification status by message reference

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

test_encryption.py

…