Martyn Inglis fd7eb54d10 Merge branch 'master' into delete-expired-things ...

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

2016-03-10 09:48:29 +00:00

..

__init__.py

Fix for git commit review.

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

api_key_dao.py

Update api-key/revoke endpoint to expire the key for the service.

2016-01-20 14:48:44 +00:00

invited_user_dao.py

Renamed some files and fixed a bug on deleting the failed notifications

2016-03-10 09:34:27 +00:00

jobs_dao.py

Move job processing into celery

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

notifications_dao.py

Merge branch 'master' into delete-expired-things

2016-03-10 09:48:29 +00:00

permissions_dao.py

Permission enums corrected, all tests passing.

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

services_dao.py

Fix for git commit review.

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

templates_dao.py

Removed some unused template dao methods

2016-02-24 11:51:02 +00:00

users_dao.py

Scheduled tasks to clean up the database

2016-03-09 17:46:01 +00:00