From 6eeeec4838d58e21087a75e437d7fbd614a09db2 Mon Sep 17 00:00:00 2001
From: woxcab <woxcab@users.noreply.github.com>
Date: Fri, 3 Nov 2017 10:23:29 +0300
Subject: [PATCH 1/4] Allow <hr> tag in the RSS item' description

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/functions.php b/include/functions.php
index f883a12e7..4265692ec 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1663,7 +1663,7 @@
 			'caption', 'cite', 'center', 'code', 'col', 'colgroup',
 			'data', 'dd', 'del', 'details', 'description', 'dfn', 'div', 'dl', 'font',
 			'dt', 'em', 'footer', 'figure', 'figcaption',
-			'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'html', 'i',
+			'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'html', 'i',
 			'img', 'ins', 'kbd', 'li', 'main', 'mark', 'nav', 'noscript',
 			'ol', 'p', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
 			'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',

From ee0f64c0f2d7109ae0f4275338bfe5fc246cca01 Mon Sep 17 00:00:00 2001
From: tschuettler <rss@schuettler.de>
Date: Tue, 14 Nov 2017 01:09:11 +0100
Subject: [PATCH 2/4] Fix german string

---
 locale/de_DE/LC_MESSAGES/messages.mo | Bin 64601 -> 64602 bytes
 locale/de_DE/LC_MESSAGES/messages.po |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 7a307dad8613110036e37886d3979578390aa377..b29dd83224b6d90812c2048c3a006087af3fa124 100644
GIT binary patch
delta 5916
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

delta 5911
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

diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index fe549e93d..2c2f11881 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -3371,7 +3371,7 @@ msgstr "Keine Profile ausgewählt."
 
 #: js/prefs.js:1353 js/prefs.js:1406
 msgid "Activate selected profile?"
-msgstr "Ausgewählte Profile entfernen?"
+msgstr "Ausgewählte Profile aktivieren?"
 
 #: js/prefs.js:1370 js/prefs.js:1422
 msgid "Please choose a profile to activate."

From d1d05f7a12e3f044e76aefae9e2847e224469baf Mon Sep 17 00:00:00 2001
From: JustAMacUser <noreply@example.org>
Date: Thu, 16 Nov 2017 12:14:20 -0500
Subject: [PATCH 3/4] Updated af_comics GoComics handling to support comics
 with numbers and use the main web URL as a feed URL (legacy FeedBurner URL
 support still exists).

---
 plugins/af_comics/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php
index 6bd3c23e2..54054399e 100644
--- a/plugins/af_comics/init.php
+++ b/plugins/af_comics/init.php
@@ -65,7 +65,7 @@ class Af_Comics extends Plugin {
 		}
 		print "</ul>";
 
-		print "<p>".__('GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>).')."</p>";
+		print "<p>".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).")."</p>";
 
 		print "<p>".__('Drop any updated filters into <code>filters.local</code> in plugin directory.')."</p>";
 
@@ -89,7 +89,7 @@ class Af_Comics extends Plugin {
 		if ($auth_login || $auth_pass)
 			return $feed_data;
 
-		if (preg_match('#^https?://feeds.feedburner.com/uclick/([-a-z]+)#', $fetch_url, $comic)) {
+		if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
 			$site_url = 'http://www.gocomics.com/' . $comic[1];
 
 			$article_link = $site_url . date('/Y/m/d');

From 1d74979dfce07838bdc57f52be5477afc557a485 Mon Sep 17 00:00:00 2001
From: JustAMacUser <noreply@example.org>
Date: Thu, 16 Nov 2017 12:18:28 -0500
Subject: [PATCH 4/4] Add viewport meta tag to Preferences page. Similiar to
 commit b4865103 for the main index.php file.

---
 prefs.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prefs.php b/prefs.php
index b1cdb0b49..82f23f583 100644
--- a/prefs.php
+++ b/prefs.php
@@ -31,6 +31,7 @@
 <html>
 <head>
 	<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
+    <meta name="viewport" content="initial-scale=1,width=device-width" />
 
 	<script type="text/javascript">
 		var __ttrss_version = "<?php echo VERSION ?>"