Martyn Inglis 8dc7a86148 Merge branch 'master' into async-job-stats ...

Conflicts:
	app/dao/services_dao.py

2017-05-18 09:34:54 +01:00

..

__init__.py

…

api_key_dao.py

…

dao_utils.py

…

date_util.py

…

dvla_organisation_dao.py

…

events_dao.py

…

invited_user_dao.py

…

jobs_dao.py

Updated jobs_Dao to make a job stats row when making a job - saves the ambiguity later as to whether the row exists.

2017-05-12 12:17:34 +01:00

notification_usage_dao.py

Update the valid_from date for the rate that is intended to start at the begining of the financial year.

2017-05-03 17:11:48 +01:00

notifications_dao.py

Revert "Process SNS request triggered by a DVLA S3 update"

2017-05-12 17:21:07 +01:00

organisation_dao.py

…

permissions_dao.py

…

provider_details_dao.py

…

provider_rates_dao.py

…

provider_statistics_dao.py

…

service_permissions_dao.py

Add default permissions when creating a service

2017-05-17 14:18:12 +01:00

service_whitelist_dao.py

…

services_dao.py

Merge branch 'master' into async-job-stats

2017-05-18 09:34:54 +01:00

statistics_dao.py

Fixed test - I had deliberately failed the test as part of debugging and not fixed the assert. Doh.

2017-05-16 12:49:20 +01:00

templates_dao.py

…

users_dao.py

…