Martyn Inglis 7f65aa3eef Merge branch 'master' into remove-nasty-query-from-dashboard ...

Conflicts:
	app/service/rest.py
	tests/app/service/test_rest.py

2017-06-01 13:11:54 +01:00

..

__init__.py

…

test_api_key_endpoints.py

update tests to use create_user instead of sample_user

2017-01-10 15:04:28 +00:00

test_archived_service.py

This is the first PR in the story to create a suspend service feature.

2017-01-30 16:32:44 +00:00

test_rest.py

Merge branch 'master' into remove-nasty-query-from-dashboard

2017-06-01 13:11:54 +01:00

test_sender.py

Fix test that doesn't account for notifications being created in a different order

2017-05-23 12:50:26 +01:00

test_service_whitelist.py

Fix PEP8 issues

2016-09-27 14:16:35 +01:00

test_statistics.py

treat sent as delivered in detailed service api

2017-04-28 11:56:12 +01:00

test_suspend_resume_service.py

This is what I meant to test

2017-01-31 11:45:35 +00:00

test_url_for.py

rename renew_api_key to create_api_key

2016-06-23 16:44:57 +01:00