Rebecca Law 3a3161ecc4 Merge branch 'master' into schedule-api-notification ...

Conflicts:
	app/celery/scheduled_tasks.py
	app/v2/notifications/post_notifications.py
	tests/app/celery/test_scheduled_tasks.py

2017-05-22 14:05:57 +01:00

..

__init__.py

…

test_api_key_dao.py

refactor authentication code

2016-06-30 10:44:21 +01:00

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

Changed the scheduled_for datetime to only send and hour of a day to send.

2017-05-17 15:06:15 +01:00

test_notification_usage_dao.py

Remove print statement

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

test_permissionDAO.py

Cancel job if the service is inactive.

2017-02-02 11:34:00 +00:00

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

Add default permissions when creating a service

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

test_service_whitelist_dao.py

Update ServiceWhitelist dao to conform to new data model

2016-09-27 13:45:36 +01:00

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

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