Martyn Inglis 8669a169eb Merge branch 'master' into primary-provider ...

Conflicts:
	app/dao/notifications_dao.py
	app/dao/provider_statistics_dao.py
	app/schemas.py
	tests/app/conftest.py

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

..

accept_invite

Working placeholders in subject with upgraded notifications-utils.

2016-04-13 15:53:27 +01:00

authentication

Update python client to version 1.0.0.

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

aws

…

celery

Ensure that the primary provider is used in all tasks

2016-05-10 09:04:22 +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-10 09:13:02 +01:00

events

Endpoint for recording events in api.

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

invite

Working placeholders in subject with upgraded notifications-utils.

2016-04-13 15:53:27 +01:00

job

Removed update_job endpoint because it is not being used

2016-04-27 09:46:45 +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

Ensure that the primary provider is used in all tasks

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

service

Fragment count endpoint added and all tests working.

2016-04-28 12:01:57 +01:00

status

Add delivery status endpoint

2016-04-29 13:00:21 +01:00

template

Get all versions for a template endpoint added.

2016-05-09 15:59:34 +01:00

template_statistics

…

user

Remove send email code task

2016-04-26 08:55:09 +01:00

__init__.py

Ensure that the primary provider is used in all tasks

2016-05-10 09:04:22 +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

Working tests and provider stats table.

2016-04-25 12:20:06 +01:00

models.py

Updated the Provider stats and rates DAO objects to query based on the identifier in the ProviderDetails object.

2016-05-06 09:09:47 +01:00

permissions_utils.py

…

schemas.py

Merge branch 'master' into primary-provider

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

version.py

…