Martyn Inglis e0d46d821d Merge branch 'master' into delete-csv-file-after-7-days ...

Conflicts:
	app/notifications/rest.py

2016-09-12 16:33:01 +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

Implemented deleted notification if SQS write fails

2016-09-08 16:00:18 +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

pep8 fixes

2016-08-23 12:05:47 +01:00

services_dao.py

tests for detailed services

2016-08-24 15:00:51 +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

…