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

…

test_api_key_dao.py

Added functionality to archive a template.

2016-04-26 10:11:18 +01:00

test_events_dao.py

Endpoint for recording events in api.

2016-04-27 10:36:59 +01:00

test_invited_user_dao.py

Replaced first queries with one queries, which throws a NoResultFound.

2016-03-11 15:34:20 +00:00

test_jobs_dao.py

Add created_by_id to jobs table.

2016-04-26 16:15:34 +01:00

test_notification_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

test_notification_statistics_dao.py

Group by Notification Statistics added and all tests working.

2016-05-05 11:04:20 +01:00

test_notifications_dao_provider_statistics.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

test_provider_details_dao.py

Ensure that the primary provider is used in all tasks

2016-05-10 09:04:22 +01:00

test_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

test_services_dao.py

Purge functional tests command added with passing test.

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

test_templates_dao.py

Template history endpoint added. All tests passing.

2016-05-06 15:47:13 +01:00

test_users_dao.py

Rebased migrations, all tests working.

2016-04-08 13:34:54 +01:00