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

…

api_key_dao.py

…

dao_utils.py

…

events_dao.py

…

invited_user_dao.py

…

jobs_dao.py

Merge branch 'master' into update-job-status

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

notifications_dao.py

Removed unused code in services_dao, which led to looking some of the queries.

2017-03-01 17:12:29 +00:00

organisation_dao.py

…

permissions_dao.py

…

provider_details_dao.py

Updates:

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

provider_rates_dao.py

…

provider_statistics_dao.py

…

service_whitelist_dao.py

…

services_dao.py

Refactored code, changed now to utcnow in test

2017-03-29 11:47:41 +01:00

templates_dao.py

Restore dao_create_template and use custom template fixture instead

2017-03-08 13:03:44 +00:00

users_dao.py

…