Martyn Inglis 838bf1d7d4 Merge branch 'master' into split-sms-and-retry ...

Conflicts:
	app/celery/tasks.py
	tests/app/celery/test_tasks.py

2016-06-17 16:39:03 +01:00

..

__init__.py

…

test_api_key_dao.py

…

test_events_dao.py

…

test_invited_user_dao.py

…

test_jobs_dao.py

…

test_notification_dao.py

Merge branch 'master' into split-sms-and-retry

2016-06-17 16:39:03 +01:00

test_notification_statistics_dao.py

…

test_notifications_dao_provider_statistics.py

Added tests for statsd and provider stats outcomes with the new provider stats tasks

2016-06-13 11:38:25 +01:00

test_provider_details_dao.py

…

test_provider_rates_dao.py

…

test_services_dao.py

When adding a user new with permissions to a service, the permissions

2016-06-07 16:35:26 +01:00

test_templates_dao.py

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

test_users_dao.py

…