Rebecca Law c8c0f95dd2 Merge branch 'master' into add-template-version ...

Conflicts:
	tests/app/dao/test_notification_dao.py

2016-05-12 09:49:35 +01:00

..

accept_invite

…

authentication

Update python client to version 1.0.0.

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

aws

…

celery

Merge branch 'master' into add-template-version

2016-05-12 09:49:35 +01:00

clients

Ensure that the primary provider is used in all tasks

2016-05-10 09:04:22 +01:00

dao

Merge branch 'master' into primary-provider

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

events

Endpoint for recording events in api.

2016-04-27 10:36:59 +01:00

invite

…

job

[WIP]

2016-05-11 17:04:51 +01:00

notifications

Message limit added and all tests passing.

2016-04-29 10:36:59 +01:00

notifications_statistics

Group by Notification Statistics added and all tests working.

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

permission

…

provider_details

Added get provider by id

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

service

Fragment count endpoint added and all tests working.

2016-04-28 12:01:57 +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

…

user

Update now to utcnow. All tests passing.

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

__init__.py

Added get provider by id

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

aws_sqs.py

…

commands.py

Purge functional tests command added with passing test.

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

encryption.py

…

errors.py

Fix test for duplicate service name

2016-04-26 15:38:20 +01:00

history_meta.py

Update now to utcnow. All tests passing.

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

models.py

Merge branch 'master' into add-template-version

2016-05-12 09:49:35 +01:00

permissions_utils.py

…

schemas.py

Merge branch 'master' into primary-provider

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

version.py

…