Martyn Inglis 8669a169eb Merge branch 'master' into primary-provider ...

Conflicts:
	app/dao/notifications_dao.py
	app/dao/provider_statistics_dao.py
	app/schemas.py
	tests/app/conftest.py

2016-05-10 09:13:02 +01:00

..

__init__.py

…

api_key_dao.py

…

dao_utils.py

…

events_dao.py

…

invited_user_dao.py

…

jobs_dao.py

…

notifications_dao.py

Merge branch 'master' into primary-provider

2016-05-10 09:13:02 +01:00

permissions_dao.py

…

provider_details_dao.py

Merge branch 'master' into primary-provider

2016-05-10 09:13:02 +01:00

provider_rates_dao.py

Updated the Provider stats and rates DAO objects to query based on the identifier in the ProviderDetails object.

2016-05-06 09:09:47 +01:00

provider_statistics_dao.py

Purge functional tests command added with passing test.

2016-05-06 11:16:30 +01:00

services_dao.py

Purge functional tests command added with passing test.

2016-05-06 11:16:30 +01:00

templates_dao.py

Get all versions for a template endpoint added.

2016-05-09 15:59:34 +01:00

users_dao.py

Purge functional tests command added with passing test.

2016-05-06 11:16:30 +01:00