Rebecca Law 30dd602dfb Merge branch 'master' into remove-provider_statistics ...

Conflicts:
	tests/app/notifications/rest/test_callbacks.py

2016-09-22 11:20:19 +01:00

..

__init__.py

…

api_key_dao.py

…

dao_utils.py

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

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

events_dao.py

…

invited_user_dao.py

…

jobs_dao.py

New jobs dao method to get jobs that are older than a certain number of days.

2016-09-07 15:36:07 +01:00

notifications_dao.py

Exclude test key notifications from:

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

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

…