Martyn Inglis cf3c14dbbd Added job_status to marshmallow ...

- ensured statues not deleted on test runs
- returns in API call

Merge branch 'add-new-column-to-jobs-for-delayed-sending' into scheduled-delivery-of-jobs

Conflicts:
	app/models.py

2016-08-24 14:35:22 +01:00

..

accept_invite

Change endpoint responses where there are marshalling, unmarshalling

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

authentication

Fix bug with expired token error response

2016-07-22 15:10:37 +01:00

aws

…

celery

Merge pull request #596 from alphagov/extend-timeout-on-db-retries

2016-08-17 09:24:49 +01:00

clients

Final pass through existing statsd endpoints to ensure they match new naming strategy.

2016-08-08 11:23:58 +01:00

dao

Tidied up the query indentation

2016-08-24 10:50:29 +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

separated schemas once more into "with template" and "with personalisation"

2016-07-26 14:34:59 +01:00

notifications

Merge pull request #599 from alphagov/version-500

2016-08-22 10:59:46 +01:00

notifications_statistics

Endpoint for reading notification stats for a given day.

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

organisation

add GET /organisation and GET /organisation/id endpoints

2016-08-09 15:59:22 +01:00

provider_details

Change endpoint responses where there are marshalling, unmarshalling

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

service

fix schema and primary key

2016-08-09 16:56:43 +01:00

spec

calculate billable units when sending an sms

2016-08-03 16:46:05 +01:00

status

…

template

Update utils for Markdown parsing + subbranding

2016-07-22 11:09:23 +01:00

template_statistics

Changed template stats for template id

2016-08-22 14:35:04 +01:00

user

Make email a required field for the email_data_schema.

2016-07-08 10:57:20 +01:00

__init__.py

add GET /organisation and GET /organisation/id endpoints

2016-08-09 15:59:22 +01:00

aws_sqs.py

…

commands.py

…

encryption.py

…

errors.py

refactored the requires_auth handler to raise exceptions

2016-06-30 10:44:21 +01:00

history_meta.py

remove history-meta for templates, replace with hand-made history table

2016-08-09 16:56:43 +01:00

models.py

Added job_status to marshmallow

2016-08-24 14:35:22 +01:00

schemas.py

Added job_status to marshmallow

2016-08-24 14:35:22 +01:00

statsd_decorators.py

Refactor statsd logging

2016-08-05 10:44:43 +01:00

utils.py

move get_all_notifications_for_service and get_all_notifications_for_job

2016-06-30 10:44:21 +01:00

version.py.dist

Create Docker build image, build project with Docker

2016-08-22 17:25:41 +01:00