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

…

test_api_key_dao.py

…

test_invited_user_dao.py

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

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

test_jobs_dao.py

Move job processing into celery

2016-02-24 17:12:30 +00:00

test_notification_dao.py

Update notification status by message reference

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

test_services_dao.py

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

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

test_templates_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

test_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