Martyn Inglis b8638a891f Merge branch 'master' into research-mode-implementation ...

Conflicts:
	tests/app/conftest.py

2016-06-02 11:53:06 +01:00

..

authentication

Update now to utcnow. All tests passing.

2016-05-11 10:56:24 +01:00

celery

Removed update reference from updating the provider stats

2016-06-02 09:52:47 +01:00

clients

tests for send_sms through mmg/firetext

2016-06-01 15:59:44 +01:00

dao

pep8 too many lines

2016-06-02 10:35:54 +01:00

events

…

invite

Update now to utcnow. All tests passing.

2016-05-11 10:56:24 +01:00

job

Add a limit days query param for get all jobs.

2016-05-24 17:21:04 +01:00

notifications

Merge branch 'master' into permanent-failure-firetext

2016-05-27 12:10:59 +01:00

permissions

…

provider_details

Load testing client added

2016-05-12 10:46:35 +01:00

service

Added some tests around creating and updated services

2016-05-31 12:49:06 +01:00

status

Update now to utcnow. All tests passing.

2016-05-11 10:56:24 +01:00

template

Only test the items of the template that can change on an update request.

2016-06-01 12:19:59 +01:00

template_statistics

…

user

Update now to utcnow. All tests passing.

2016-05-11 10:56:24 +01:00

__init__.py

…

conftest.py

Merge branch 'master' into research-mode-implementation

2016-06-02 11:53:06 +01:00

test_encryption.py

…