Rebecca Law 4f6a66c904 Merge branch 'master' into update-job-status ...

Conflicts:
	app/dao/jobs_dao.py
	tests/app/dao/test_jobs_dao.py

2017-04-06 11:11:37 +01:00

..

__init__.py

…

test_api_key_dao.py

refactor authentication code

2016-06-30 10:44:21 +01:00

test_events_dao.py

…

test_invited_user_dao.py

…

test_jobs_dao.py

Merge branch 'master' into update-job-status

2017-04-06 11:11:37 +01:00

test_notification_dao.py

Remove created notification - not needed for test

2017-02-27 15:01:44 +00:00

test_permissionDAO.py

Cancel job if the service is inactive.

2017-02-02 11:34:00 +00:00

test_provider_details_dao.py

Updates:

2017-03-03 10:54:20 +00:00

test_provider_rates_dao.py

…

test_provider_statistics_dao.py

Allow filtering of billing info by financial year

2017-01-27 11:13:22 +00:00

test_service_whitelist_dao.py

Update ServiceWhitelist dao to conform to new data model

2016-09-27 13:45:36 +01:00

test_services_dao.py

Add template type to response and refactor

2017-03-08 12:01:38 +00:00

test_templates_dao.py

Moved the cache key to the utils module.

2017-02-14 14:22:52 +00:00

test_users_dao.py

Changes as per code review comments.

2017-02-15 17:41:07 +00:00