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

..

authentication

Fix bug with expired token error response

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

celery

Merge pull request #599 from alphagov/version-500

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

clients

Moved mmg_url to configs.

2016-07-20 10:40:50 +01:00

dao

Changed template stats for template id

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

events

…

invite

…

job

Added job_status to marshmallow

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

notifications

Merge pull request #599 from alphagov/version-500

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

organisation

add GET /organisation and GET /organisation/id endpoints

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

provider_details

make tests run consistently

2016-07-25 09:47:38 +01:00

service

let users set organisation on POST /service/{id}

2016-08-15 10:54:26 +01:00

spec

…

status

…

template

…

template_statistics

Removed print

2016-08-24 10:59:33 +01:00

user

…

__init__.py

…

conftest.py

Merge pull request #583 from alphagov/stats-db-updates

2016-08-08 11:48:01 +01:00

test_encryption.py

…

test_schemas.py

…

test_statsd_decorators.py

Refactor statsd logging

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