From 6793a0d31326f435f70d3144fe3cbbb9f5bafa49 Mon Sep 17 00:00:00 2001
From: Mayur Dhamanwala <mdhamanwala@aap.com.au>
Date: Thu, 11 Aug 2016 09:15:36 +1000
Subject: [PATCH 1/3] Updating dependencies.

---
 client/package.json     | 2 +-
 server/requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index fff8bda14..c43067f9e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -2,7 +2,7 @@
     "name": "superdesk",
     "license": "GPL-3.0",
     "dependencies": {
-        "superdesk-core": "superdesk/superdesk-client-core#579b60a03",
+        "superdesk-core": "superdesk/superdesk-client-core#beac67bdc",
         "babel-core": "^6.10.4",
         "babel-loader": "^6.2.4",
         "babel-preset-es2015": "^6.9.0",
diff --git a/server/requirements.txt b/server/requirements.txt
index d34fd317a..2db0cfb28 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -3,4 +3,4 @@ honcho==0.6.6
 pyodbc==3.0.10
 unidecode==0.04.19
 
-git+git://github.com/superdesk/superdesk-core.git@4428df364#egg=Superdesk-Core
\ No newline at end of file
+git+git://github.com/superdesk/superdesk-core.git@2c6a4b5a5#egg=Superdesk-Core
\ No newline at end of file

From a95b1eda4f65720329a0f15505c8cb7bc879c8ca Mon Sep 17 00:00:00 2001
From: Mayur Dhamanwala <mdhamanwala@aap.com.au>
Date: Thu, 11 Aug 2016 10:28:05 +1000
Subject: [PATCH 2/3] (fix) Modified email template to remove AAP.

---
 server/templates/article_killed.html | 2 +-
 server/templates/article_killed.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/templates/article_killed.html b/server/templates/article_killed.html
index 3e3577d6c..c2a4bfbdf 100644
--- a/server/templates/article_killed.html
+++ b/server/templates/article_killed.html
@@ -4,5 +4,5 @@
     {{body | safe}}
 
 <p>Regards,</p>
-<p>Mike Osborne Editor AAP</p>
+<p>Mike Osborne Editor</p>
 
diff --git a/server/templates/article_killed.txt b/server/templates/article_killed.txt
index 086c73aa9..8e179b5dd 100644
--- a/server/templates/article_killed.txt
+++ b/server/templates/article_killed.txt
@@ -4,6 +4,6 @@
     {{body | striptags}}
 
 Regards,
-Mike Osborne Editor AAP
+Mike Osborne Editor
 
 

From c68ed61a39e281ef73fe38a0976dcc0a4bc9f020 Mon Sep 17 00:00:00 2001
From: Mayur Dhamanwala <mdhamanwala@aap.com.au>
Date: Thu, 11 Aug 2016 10:38:02 +1000
Subject: [PATCH 3/3] fix(formatter) Modified formatter to strip html for
 bulletin builder.

---
 server/aap/publish/formatters/aap_bulletinbuilder_formatter.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/aap/publish/formatters/aap_bulletinbuilder_formatter.py b/server/aap/publish/formatters/aap_bulletinbuilder_formatter.py
index 523b357c6..bedcd0471 100644
--- a/server/aap/publish/formatters/aap_bulletinbuilder_formatter.py
+++ b/server/aap/publish/formatters/aap_bulletinbuilder_formatter.py
@@ -48,6 +48,8 @@ def format(self, article, subscriber, codes=None):
                 to_ascii(formatted_article.get('abstract', ''))).strip()
             formatted_article['headline'] = self.get_text_content(
                 to_ascii(formatted_article.get('headline', ''))).strip()
+            formatted_article['byline'] = self.get_text_content(
+                to_ascii(formatted_article.get('byline', ''))).strip()
 
             # get the first category and derive the locator
             category = next((iter(formatted_article.get('anpa_category', []))), None)