Martyn Inglis c57e2a6894 Merge branch 'master' into inbound-sms ...

Conflicts:
	app/notifications/receive_notifications.py
	tests/app/notifications/test_receive_notification.py

2017-06-01 15:56:33 +01:00

..

__init__.py

…

api_key_dao.py

…

dao_utils.py

…

date_util.py

Change get_financial_year to return ending date as 1 microsecond earlier.

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

dvla_organisation_dao.py

Revert "Revert "add DVLA organisations to API""

2017-04-21 16:05:07 +01:00

events_dao.py

…

inbound_sms_dao.py

add inbound sms table

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

invited_user_dao.py

…

jobs_dao.py

Ignore one-off messages in job list on dashboard

2017-06-01 12:30:47 +01:00

notification_usage_dao.py

Typo removed. Wrong window focus

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

notifications_dao.py

Don’t 500 when searching with bad email address

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

organisation_dao.py

…

permissions_dao.py

Cancel job if the service is inactive.

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

provider_details_dao.py

Filter provider details by international flags

2017-04-27 12:13:58 +01:00

provider_rates_dao.py

…

provider_statistics_dao.py

Allow filtering of billing info by financial year

2017-01-27 11:13:22 +00:00

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 inbound-sms

2017-06-01 15:56:33 +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

Corrected code to handle template types

2017-04-19 10:51:12 +01:00

users_dao.py

update_user now resets failed_login_count if password is changed

2017-02-16 17:39:47 +00:00