From 08c007d998146f87424b6f0de81a7db29968061e Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 18 Dec 2017 11:52:56 +0000
Subject: [PATCH 1/3] Add Marine Management Organisation as email domain

Seems like sometimes they use a Defra email address, sometimes their
own .org.uk one.
---
 app/config.py                     | 1 +
 tests/app/main/test_validators.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/config.py b/app/config.py
index d1a2e222c..04b0bbc59 100644
--- a/app/config.py
+++ b/app/config.py
@@ -96,6 +96,7 @@ class Config(object):
         r"acas\.org\.uk",
         r"gov\.wales",
         r"biglotteryfund\.org\.uk",
+        r"marinemanagement\.org\.uk",
     ]
 
     LOGO_UPLOAD_BUCKET_NAME = 'public-logos-local'
diff --git a/tests/app/main/test_validators.py b/tests/app/main/test_validators.py
index d2b5fe574..f16e71a2c 100644
--- a/tests/app/main/test_validators.py
+++ b/tests/app/main/test_validators.py
@@ -99,6 +99,7 @@ def _gen_mock_field(x):
     'test@bbsrc.ac.uk',
     'test@acas.org.uk',
     'test@biglotteryfund.org.uk',
+    'test@marinemanagement.org.uk',
 ])
 def test_valid_list_of_white_list_email_domains(
     client,

From 3df3c61279018428a3d96486b33833dc1a8b4963 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 18 Dec 2017 14:13:40 +0000
Subject: [PATCH 2/3] Fix page titles on callbacks documentation

This page is no longer just about inbound.
---
 app/templates/views/callbacks.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/callbacks.html b/app/templates/views/callbacks.html
index c17c129b9..b0a70920c 100644
--- a/app/templates/views/callbacks.html
+++ b/app/templates/views/callbacks.html
@@ -2,7 +2,7 @@
 {% extends "withoutnav_template.html" %}
 
 {% block per_page_title %}
-  Callbacks for received text messages
+  Callbacks
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -10,7 +10,7 @@
 <div class="grid-row">
   <div class="column-two-thirds">
 
-    <h1 class="heading-large">Callbacks for received text messages</h1>
+    <h1 class="heading-large">Callbacks</h1>
     <p>A callback lets you receive messages from Notify to a URL you choose.</p>
     <p>You’ll need to provide a bearer token, for security. We’ll add this to the authorisation header of the callback request.</p>
     <p>The callback message is in JSON.</p>

From 3a67555d4d87ea01493aa20aefa51df9eb6e3758 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 18 Dec 2017 14:14:36 +0000
Subject: [PATCH 3/3] Update callbacks.html

---
 app/templates/views/callbacks.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/callbacks.html b/app/templates/views/callbacks.html
index b0a70920c..dceb32a46 100644
--- a/app/templates/views/callbacks.html
+++ b/app/templates/views/callbacks.html
@@ -2,7 +2,7 @@
 {% extends "withoutnav_template.html" %}
 
 {% block per_page_title %}
-  Callbacks
+  Callback documentation
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -10,7 +10,7 @@
 <div class="grid-row">
   <div class="column-two-thirds">
 
-    <h1 class="heading-large">Callbacks</h1>
+    <h1 class="heading-large">Callback documentation</h1>
     <p>A callback lets you receive messages from Notify to a URL you choose.</p>
     <p>You’ll need to provide a bearer token, for security. We’ll add this to the authorisation header of the callback request.</p>
     <p>The callback message is in JSON.</p>