Rebecca Law 49198b26e7 Merge branch 'master' into reset-password ...

Conflicts:
	app/schemas.py
	tests/app/celery/test_tasks.py

2016-03-09 09:36:57 +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

[WIP] Start of api for accepting invite.

2016-03-01 14:13:38 +00:00

jobs_dao.py

Move job processing into celery

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

notifications_dao.py

Build rest endpoint to read service stats

2016-03-08 16:34:03 +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

- Remove password_changed_at from the update_dict in users_dao

2016-03-08 14:33:06 +00:00