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

..

__init__.py

Fix for git commit review.

2016-02-29 11:50:43 +00:00

api_key_dao.py

…

invited_user_dao.py

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

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

jobs_dao.py

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

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

notifications_dao.py

Merge branch 'master' into client-callbacks

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

permissions_dao.py

Permission enums corrected, all tests passing.

2016-03-02 15:34:26 +00:00

services_dao.py

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

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

templates_dao.py

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

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

users_dao.py

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