Rebecca Law 53efb4e033 Merge branch 'master' into schedule-api-notification ...

Conflicts:
	tests/app/v2/notifications/test_post_notifications.py

2017-05-23 13:58:50 +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

Add pending flag to scheduled_notifications.

2017-05-22 15:07:16 +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

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

Update services test

2017-05-22 17:27:26 +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

…