diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 2 | ||||
| -rw-r--r-- | constants.php | 2 | ||||
| -rw-r--r-- | docs/en/users/06_Fever_API.md | 2 | ||||
| -rw-r--r-- | p/themes/Swage/icons/refresh.svg | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7759d7a56..dac6be8e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # FreshRSS changelog +## 2019-0X-XX FreshRSS 1.14.3-dev + + + ## 2019-04-08 FreshRSS 1.14.2 * Bug fixing (regressions introduced in 1.14.X) diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index be8034c0d..d6b9885f5 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -240,7 +240,7 @@ <div class="group-controls"> <textarea name="filteractions_read" id="filteractions_read"><?php foreach ($this->feed->filtersAction('read') as $filterRead) { - echo htmlspecialchars($filterRead->getRawInput(), ENT_NOQUOTES, 'UTF-8'), "\n\n"; + echo htmlspecialchars($filterRead->getRawInput(), ENT_NOQUOTES, 'UTF-8'), PHP_EOL; } ?></textarea> <?php echo _i('help'); ?> <?php echo _t('sub.feed.filteractions.help'); ?> diff --git a/constants.php b/constants.php index 6545d862a..2ecbf16fe 100644 --- a/constants.php +++ b/constants.php @@ -2,7 +2,7 @@ //NB: Do not edit; use ./constants.local.php instead. //<Not customisable> -define('FRESHRSS_VERSION', '1.14.2'); +define('FRESHRSS_VERSION', '1.14.3-dev'); define('FRESHRSS_WEBSITE', 'https://freshrss.org'); define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/'); diff --git a/docs/en/users/06_Fever_API.md b/docs/en/users/06_Fever_API.md index 909164516..b895d4eae 100644 --- a/docs/en/users/06_Fever_API.md +++ b/docs/en/users/06_Fever_API.md @@ -26,7 +26,7 @@ Tested with: - iOS - [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) - [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) - - [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) + - [Reeder-4](https://itunes.apple.com/app/reeder-4/id1449412357) - MacOS - [Readkit](https://itunes.apple.com/app/readkit/id588726889) diff --git a/p/themes/Swage/icons/refresh.svg b/p/themes/Swage/icons/refresh.svg index 858a1f50f..1c211abf6 100644 --- a/p/themes/Swage/icons/refresh.svg +++ b/p/themes/Swage/icons/refresh.svg @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <svg enable-background="new 0 0 16 16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> <style type="text/css">.st0{fill:#FFFFFF;}</style> -<path class="st0" d="M13.5,2.4C12.1,1,10.1,0.1,8,0.1c-4.3,0-7.7,3.5-7.7,7.7s3.5,7.7,7.7,7.7c3.6,0,6.6-2.5,7.5-5.8h-2,c-0.8,2.3-2.9,3.9-5.5,3.9c-3.2,0-5.8-2.6-5.8-5.8S4.8,2.1,8,2.1c1.6,0,3,0.7,4.1,1.7L9,6.9h6.8V0.1L13.5,2.4z"/> +<path class="st0" d="M13.5,2.4C12.1,1,10.1,0.1,8,0.1c-4.3,0-7.7,3.5-7.7,7.7s3.5,7.7,7.7,7.7c3.6,0,6.6-2.5,7.5-5.8h-2c-0.8,2.3-2.9,3.9-5.5,3.9c-3.2,0-5.8-2.6-5.8-5.8S4.8,2.1,8,2.1c1.6,0,3,0.7,4.1,1.7L9,6.9h6.8V0.1L13.5,2.4z"/> </svg> - |
