Rebecca Law cefa00b3fa Merge branch 'master' into fix-billable-units-query ...

Conflicts:
	tests/app/dao/test_notification_dao.py

2017-01-10 14:24:08 +00:00

..

__init__.py

…

api_key_dao.py

…

dao_utils.py

move deactivate functionality into one database transactions

2016-11-11 11:20:41 +00:00

events_dao.py

…

invited_user_dao.py

…

jobs_dao.py

filter out test jobs from the GET /service/{}/job endpoint

2016-10-11 14:30:40 +01:00

notifications_dao.py

Merge branch 'master' into fix-billable-units-query

2017-01-10 14:24:08 +00:00

organisation_dao.py

…

permissions_dao.py

…

provider_details_dao.py

add updated_at to provider_details

2016-12-19 17:45:46 +00:00

provider_rates_dao.py

…

provider_statistics_dao.py

…

service_whitelist_dao.py

Update ServiceWhitelist dao to conform to new data model

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

services_dao.py

Update the query to execute immediately.

2016-12-29 13:28:55 +00:00

templates_dao.py

…

users_dao.py

Add user dao method to update a single user attr

2016-11-07 17:42:39 +00:00