Merge pull request #82 from mdhaman/update-core

Updating dependencies.
superdesk · Aug 11, 2016 · cb5a2e2 · cb5a2e2
2 parents 273b2b7 + c68ed61
commit cb5a2e2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git 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)

diff --git 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
+git+git://github.com/superdesk/superdesk-core.git@2c6a4b5a5#egg=Superdesk-Core
diff --git 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
@@ -4,6 +4,6 @@
     {{body | striptags}}
 
 Regards,
-Mike Osborne Editor AAP
+Mike Osborne Editor