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

…

test_api_key_dao.py

…

test_date_utils.py

…

test_events_dao.py

…

test_invited_user_dao.py

…

test_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

test_notification_dao.py

Merge pull request #942 from alphagov/status-as-table

2017-05-10 13:54:49 +01:00

test_notification_usage_dao.py

Remove print statement

2017-05-04 09:47:27 +01:00

test_permissionDAO.py

…

test_provider_details_dao.py

…

test_provider_rates_dao.py

…

test_provider_statistics_dao.py

…

test_service_permissions_dao.py

Add default permissions when creating a service

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

test_service_whitelist_dao.py

…

test_services_dao.py

Remove whitespace

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

test_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

test_templates_dao.py

…

test_users_dao.py

…