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

…

test_api_key_dao.py

…

test_date_utils.py

…

test_events_dao.py

…

test_invited_user_dao.py

…

test_jobs_dao.py

Rename ‘One-off message’ to ‘Report’

2017-06-01 13:56:47 +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_permissions_dao.py

add inbound sms table

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

test_provider_details_dao.py

…

test_provider_rates_dao.py

…

test_provider_statistics_dao.py

…

test_service_permissions_dao.py

…

test_service_whitelist_dao.py

…

test_services_dao.py

add inbound sms table

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

test_statistics_dao.py

…

test_templates_dao.py

…

test_users_dao.py

…