Martyn Inglis b213c3fa3c Merge branch 'master' into celery-jobs ...

Conflicts:
	tests/app/conftest.py

2016-02-25 15:10:39 +00:00

..

__init__.py

All four http methods working now for user and service restful apis.

2016-01-11 17:19:06 +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

[WIP] changed dao query to use .first and return specific not found

2016-02-25 12:13:25 +00:00

jobs_dao.py

Move job processing into celery

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

notifications_dao.py

Renamed the header of the CSV to 'to' from 'number' to allow for email jobs

2016-02-25 09:59:50 +00:00

services_dao.py

Slight tiny up of templates_dao

2016-02-22 09:46:16 +00:00

templates_dao.py

Removed some unused template dao methods

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

users_dao.py

Add endpoint for getting user by email address

2016-02-23 11:03:59 +00:00