Martyn Inglis c57e2a6894 Merge branch 'master' into inbound-sms ...

Conflicts:
	app/notifications/receive_notifications.py
	tests/app/notifications/test_receive_notification.py

2017-06-01 15:56:33 +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

Merge branch 'master' into redo-queue-visibitlity-timeout

2017-05-30 10:18:18 +01:00

clients

…

dao

Merge branch 'master' into inbound-sms

2017-06-01 15:56:33 +01:00

delivery

Revert "Revert "Remove nulls from sms_sender""

2017-06-01 11:00:26 +01:00

dvla_organisation

Revert "Revert "add DVLA organisations to API""

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

events

…

invite

This massive set of changes uses the new queue names object throughout the app and tests.

2017-05-25 10:51:49 +01:00

job

This massive set of changes uses the new queue names object throughout the app and tests.

2017-05-25 10:51:49 +01:00

letters

This massive set of changes uses the new queue names object throughout the app and tests.

2017-05-25 10:51:49 +01:00

notifications

Merge branch 'master' into inbound-sms

2017-06-01 15:56:33 +01:00

organisation

…

provider_details

Add international support flag for providers

2017-04-25 17:33:16 +01:00

public_contracts

…

service

Remved test re-added as part of a merge

2017-06-01 14:57:46 +01:00

spec

…

status

…

template

…

template_statistics

…

user

This massive set of changes uses the new queue names object throughout the app and tests.

2017-05-25 10:51:49 +01:00

v2

Merge pull request #991 from alphagov/invite-service-to-schedule

2017-06-01 12:37:32 +01:00

__init__.py

…

conftest.py

Merge pull request #984 from alphagov/ken-update-api-service-permissions-handling

2017-05-26 14:39:27 +01:00

db.py

add inbound sms table

2017-05-30 10:47:01 +01:00

test_cloudfoundry_config.py

…

test_config.py

…

test_encryption.py

…

test_model.py

add type conversion to report downloads

2017-04-28 11:00:55 +01:00

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

Updated the serialization of Notification.scheduled_for to include minutes.

2017-05-24 14:52:32 +01:00