Martyn Inglis 838bf1d7d4 Merge branch 'master' into split-sms-and-retry ...

Conflicts:
	app/celery/tasks.py
	tests/app/celery/test_tasks.py

2016-06-17 16:39:03 +01:00

..

accept_invite

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

authentication

Update python client to version 1.0.0.

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

aws

…

celery

Merge branch 'master' into split-sms-and-retry

2016-06-17 16:39:03 +01:00

clients

Merge pull request #377 from alphagov/single_from_number

2016-06-09 10:41:39 +01:00

dao

Merge branch 'master' into split-sms-and-retry

2016-06-17 16:39:03 +01:00

events

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

invite

Use the send email task to send the password reset and invitation email.

2016-06-16 17:34:33 +01:00

job

Updated for pr comments

2016-06-15 16:19:28 +01:00

notifications

Merge pull request #426 from alphagov/api-template-response

2016-06-16 11:36:08 +01:00

notifications_statistics

Endpoint for reading notification stats for a given day.

2016-06-16 17:02:33 +01:00

provider_details

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

service

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

status

Update now to utcnow. All tests passing.

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

template

Remove wrapper around response object

2016-06-17 12:57:43 +01:00

template_statistics

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

user

Remove print

2016-06-17 11:01:26 +01:00

__init__.py

Refactor permissions dao - removed custom query filter

2016-06-15 16:32:52 +01:00

aws_sqs.py

…

commands.py

Add server_commands and update readme.md

2016-05-18 12:20:56 +01:00

encryption.py

…

errors.py

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

history_meta.py

Update template json to return created_at and updated_at. Also fixed a bug where updated_at was not being added to the templates_history model.

2016-05-19 17:02:55 +01:00

models.py

Twilio config variables removed.

2016-06-13 08:39:33 +01:00

schemas.py

Merge branch 'master' into refactor-query-filters

2016-06-16 10:26:17 +01:00

version.py

…