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

Conflicts:
	tests/app/conftest.py

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

..

__init__.py

…

test_api_key_dao.py

Add unique constraint for api_key on service_id and name

2016-01-21 16:53:53 +00:00

test_invited_user_dao.py

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

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

test_jobs_dao.py

Move job processing into celery

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

test_notification_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

test_services_dao.py

Refactored the services dao to be a little cleaner

2016-02-19 15:53:15 +00:00

test_templates_dao.py

Updates to template endpoints:

2016-02-22 12:55:18 +00:00

test_users_dao.py

Add endpoint for getting user by email address

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