Rebecca Law 39c9d9ebe9 Merge branch 'master' into refactor-query-filters ...

Conflicts:
	app/permission/rest.py

2016-06-16 10:26:17 +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

Updated to retrieve csv upload from new bucket.

2016-04-07 14:10:30 +01:00

celery

Rename the task so that it is the name we want to use.

2016-06-15 14:11:17 +01:00

clients

Merge pull request #377 from alphagov/single_from_number

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

dao

Refactor permissions dao - removed custom query filter

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

events

Change endpoint responses where there are marshalling, unmarshalling

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

invite

Change endpoint responses where there are marshalling, unmarshalling

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

job

Updated for pr comments

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

notifications

Updated for pr comments

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

notifications_statistics

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +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

Updated for pr comments

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

template_statistics

Change endpoint responses where there are marshalling, unmarshalling

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

user

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +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

Don't send the SMS if we have failed to save in the database

2016-02-16 17:42:04 +00:00

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

Updated to populate on dev

2016-03-03 15:32:22 +00:00