Rebecca Law 11ac7b2874 Merge branch 'master' into notification-created-status ...

Conflicts:
	app/dao/notifications_dao.py

2016-06-22 16:15:56 +01:00

..

accept_invite

Change endpoint responses where there are marshalling, unmarshalling

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

authentication

Update auth module to return consistently formed error messages.

2016-06-17 14:22:58 +01:00

aws

…

celery

The send_sms task will created the notification with a status = created.

2016-06-22 13:32:27 +01:00

clients

Merge pull request #377 from alphagov/single_from_number

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

dao

Merge pull request #464 from alphagov/refactor-api-key

2016-06-22 15:57:38 +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

Template and personalisation content is now merged and returned with

2016-06-20 16:49:17 +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

Refactor the api_key_dao.

2016-06-22 15:27:28 +01:00

status

…

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

…

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

[WIP] updating notification to start in the created status

2016-06-21 15:51:30 +01:00

schemas.py

Template and personalisation content is now merged and returned with

2016-06-20 16:49:17 +01:00

version.py

…