Rebecca Law 53efb4e033 Merge branch 'master' into schedule-api-notification ...

Conflicts:
	tests/app/v2/notifications/test_post_notifications.py

2017-05-23 13:58:50 +01:00

..

accept_invite

…

authentication

…

aws

Add get_s3_file method for use in DVLA processing

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

celery

Add pending flag to scheduled_notifications.

2017-05-22 15:07:16 +01:00

clients

…

dao

Merge branch 'master' into schedule-api-notification

2017-05-23 13:58:50 +01:00

delivery

treat 40604 and GOVUK as not having a sender ID

2017-05-22 17:10:07 +01:00

dvla_organisation

…

events

…

invite

…

job

marshmallow schemas no longer return _status_enum column

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

letters

…

notifications

Update dateformat for scheduled_for to include minutes.

2017-05-22 14:15:35 +01:00

organisation

…

provider_details

…

public_contracts

…

service

Fix test that doesn't account for notifications being created in a different order

2017-05-23 12:50:26 +01:00

spec

…

status

…

template

…

template_statistics

…

user

Add service permissions DAO and refactor user service permission mock

2017-05-15 17:28:14 +01:00

v2

Merge branch 'master' into schedule-api-notification

2017-05-23 13:58:50 +01:00

__init__.py

…

conftest.py

Add pending flag to scheduled_notifications.

2017-05-22 15:07:16 +01:00

db.py

Add restricted argument for service mock

2017-05-17 16:06:35 +01:00

test_cloudfoundry_config.py

…

test_config.py

…

test_encryption.py

…

test_model.py

…

test_route_authentication.py

…

test_schemas.py

marshmallow schemas no longer return _status_enum column

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

test_statsd_decorators.py

…

test_user_agent_processing.py

…

test_utils.py

Changed the scheduled_for datetime to only send and hour of a day to send.

2017-05-17 15:06:15 +01:00