Martyn Inglis 09b3313ce3 Merge branch 'master' into primary-provider ...

Conflicts:
	tests/app/dao/test_provider_rates_dao.py

2016-05-11 14:04:15 +01:00

..

authentication

Update now to utcnow. All tests passing.

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

celery

Merge branch 'master' into primary-provider

2016-05-11 14:04:15 +01:00

clients

Update mmg responses so that 3 is success.

2016-04-20 14:29:31 +01:00

dao

Update now to utcnow. All tests passing.

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

events

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

invite

Update now to utcnow. All tests passing.

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

job

Add a load only and dump only for the created_by attribute of the JobSchema

2016-05-11 12:03:25 +01:00

notifications

Group by Notification Statistics added and all tests working.

2016-05-05 11:04:20 +01:00

permissions

Purge functional tests command added with passing test.

2016-05-06 11:16:30 +01:00

provider_details

Added get provider by id

2016-05-10 15:18:41 +01:00

service

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

status

Update now to utcnow. All tests passing.

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

template

Add user details to template schema dump.

2016-05-10 14:55:59 +01:00

template_statistics

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

user

Update now to utcnow. All tests passing.

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

__init__.py

SES Callback testing

2016-03-14 14:49:02 +00:00

conftest.py

Merge branch 'master' into primary-provider

2016-05-10 09:13:02 +01:00

test_encryption.py

…