Martyn Inglis 8dc7a86148 Merge branch 'master' into async-job-stats ...

Conflicts:
	app/dao/services_dao.py

2017-05-18 09:34:54 +01:00

..

accept_invite

…

authentication

Store the service we have used to authenticate the client API user against the request.

2017-05-05 15:19:57 +01:00

aws

Add get_s3_file method for use in DVLA processing

2017-05-15 10:48:37 +01:00

celery

Merge branch 'master' into async-job-stats

2017-05-17 09:49:43 +01:00

clients

Added a 60 second timeout to the MMG and fire text clients.

2017-04-05 15:31:37 +01:00

dao

Merge branch 'master' into async-job-stats

2017-05-18 09:34:54 +01:00

delivery

Use the new task wrapper methods rather than creating a task directly

2017-05-09 18:17:55 +01:00

dvla_organisation

Revert "Revert "add DVLA organisations to API""

2017-04-21 16:05:07 +01:00

events

…

invite

…

job

Refactor tests

2017-04-21 11:07:45 +01:00

letters

Changed response to 201 for send_letter_jobs

2017-04-11 16:42:08 +01:00

notifications

Merge branch 'master' into async-job-stats

2017-05-18 09:34:54 +01:00

organisation

…

provider_details

…

schema_validation

fix v2 schema phone/email validation when non-str passed in

2017-05-10 11:04:12 +01:00

service

Don't send notification if other service attrs changed

2017-05-15 15:02:01 +01:00

spec

…

status

…

template

…

template_statistics

…

user

…

v2

Code tidy up as be @imdad comments.

2017-05-16 12:55:12 +01:00

__init__.py

Make the service available to code on the request context

2017-05-05 15:20:23 +01:00

.gitignore

…

cloudfoundry_config.py

Can't set environs to nonetype

2017-03-31 17:10:43 +01:00

commands.py

…

config.py

Merge branch 'master' into async-job-stats

2017-05-18 09:34:54 +01:00

encryption.py

…

errors.py

add new notification_status column to models.py

2017-05-04 17:24:28 +01:00

history_meta.py

…

models.py

Merge branch 'master' into async-job-stats

2017-05-18 09:34:54 +01:00

schemas.py

marshmallow schemas no longer return _status_enum column

2017-05-10 17:30:09 +01:00

statsd_decorators.py

…

utils.py

Refactored get utc in bst to use localize

2017-04-03 16:20:54 +01:00

version.py.dist

…