Imdad Ahad f9b539d71e Fix conflict

2016-09-27 16:54:00 +01:00

..

__init__.py

…

api_key_dao.py

refactor authentication code

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

dao_utils.py

improved service whitelist endpoints

2016-09-23 12:21:00 +01:00

events_dao.py

…

invited_user_dao.py

…

jobs_dao.py

fix dao_get_jobs_by_service_id

2016-09-23 17:05:42 +01:00

notifications_dao.py

Make DAO optionally return test key notifications

2016-09-23 10:37:26 +01: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

…

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

Exclude test key notifications from:

2016-09-16 13:47:09 +01: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

…