Martyn Inglis 7f65aa3eef Merge branch 'master' into remove-nasty-query-from-dashboard ...

Conflicts:
	app/service/rest.py
	tests/app/service/test_rest.py

2017-06-01 13:11:54 +01:00

..

__init__.py

…

test_api_key_dao.py

…

test_date_utils.py

Change get_financial_year to return ending date as 1 microsecond earlier.

2017-05-02 10:00:47 +01:00

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

Don’t 500 when searching with bad email address

2017-05-30 14:50:48 +01:00

test_notification_usage_dao.py

Removed print statement

2017-05-24 09:59:07 +01:00

test_permissionDAO.py

…

test_provider_details_dao.py

Removed unneeded test case

2017-04-27 12:15:47 +01:00

test_provider_rates_dao.py

…

test_provider_statistics_dao.py

add new notification status 'sent'

2017-04-25 17:08:29 +01:00

test_service_permissions_dao.py

Refactored service_permissions data model

2017-05-22 17:25:58 +01:00

test_service_whitelist_dao.py

…

test_services_dao.py

Refactored tests

2017-05-25 17:48:09 +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

Moved the cache key to the utils module.

2017-02-14 14:22:52 +00:00

test_users_dao.py

Changes as per code review comments.

2017-02-15 17:41:07 +00:00