Rebecca Law c6df84a8f3 Merge branch 'master' into do-not-write-test-data-to-the-history-table ...

Conflicts:
	app/dao/notifications_dao.py

2016-12-21 09:57:17 +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 do-not-write-test-data-to-the-history-table

2016-12-21 09:57:17 +00:00

organisation_dao.py

add GET /organisation and GET /organisation/id endpoints

2016-08-09 15:59:22 +01:00

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

Remove provider_statistics_dao.get_provider_statistics

2016-09-19 17:24:26 +01:00

service_whitelist_dao.py

Update ServiceWhitelist dao to conform to new data model

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

services_dao.py

Allow excluding test key use in the all services stats query

2016-12-05 17:35:19 +00:00

templates_dao.py

remove history-meta for templates, replace with hand-made history table

2016-08-09 16:56:43 +01:00

users_dao.py

Add user dao method to update a single user attr

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