From 70d06ca7591da5e7f09cde942c72b52f7af06ba4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 25 Jul 2019 16:55:27 +0200
Subject: Start 1.14.4-dev

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f33712f73..92a941280 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # FreshRSS changelog
 
+## 2019-XX-XX FreshRSS 1.14.4-dev
+
+
+
 ## 2019-07-25 FreshRSS 1.14.3
 
 * UI
-- 
cgit v1.2.3


From d37032121b09dc6acdcd72b2eac727f29b074f24 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 21 Aug 2019 22:33:06 +0200
Subject: Docker Alpine 3.10.2

https://alpinelinux.org/posts/Alpine-3.10.2-released.html
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92a941280..f0b3745ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@
 	* Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438), [#2455](https://github.com/FreshRSS/FreshRSS/pull/2455)
 	* Docker: Add a version for ARM architecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436)
 	* Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422)
-	* Docker: Alpine image updated to 3.10 with PHP 7.3.7 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+	* Docker: Alpine image updated to 3.10 with PHP 7.3.8 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
 	* Add `hadolint` automatic check of Docker files in Travis [#2456](https://github.com/FreshRSS/FreshRSS/pull/2456)
 * Security
 	* Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391)
-- 
cgit v1.2.3


From 48dda9a803d4c461b6e8b1d2484aaa803ee25462 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 21 Aug 2019 22:52:18 +0200
Subject: Changelog

---
 CHANGELOG.md | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0b3745ed..443302273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 ## 2019-XX-XX FreshRSS 1.14.4-dev
 
+* Features
+	* New option to display article authors underneath the article title [#2487](https://github.com/FreshRSS/FreshRSS/pull/2487)
+	* Add e-mail capability [#2476](https://github.com/FreshRSS/FreshRSS/pull/2476)
+* Compatibility
+	* Require at least PHP 5.5+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495)
+* Deployment
+	* Take advantage of `mod_authz_core` instead of `mod_access_compat` when running on Apache 2.4+ [#2461](https://github.com/FreshRSS/FreshRSS/pull/2461)
+	* Docker: Alpine image updated to 3.10 with PHP 7.3.8 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+* Bug fixing
+	* Fix missing PHP `opcache` package in Docker Alpine [#2498](https://github.com/FreshRSS/FreshRSS/pull/2498)
+* Security
+	* Fix referrer vulnerability when opening an article original link with a shortcut [#2506](https://github.com/FreshRSS/FreshRSS/pull/2506)
+	* Slight refactoring of access check [#2471](https://github.com/FreshRSS/FreshRSS/pull/2471)
+* I18n
+	* Improve Dutch [#2503](https://github.com/FreshRSS/FreshRSS/pull/2503)
+	* Add Slovak [#2497](https://github.com/FreshRSS/FreshRSS/pull/2497)
+* Extensions
+	* Additional hooks [#2482](https://github.com/FreshRSS/FreshRSS/pull/2482)
+	* New call to change the layout [#2467](https://github.com/FreshRSS/FreshRSS/pull/2467)
+* Misc.
+	* Automatic check of CSS syntax in Travis CI [#2477](https://github.com/FreshRSS/FreshRSS/pull/2477)
+	* Remove support for sharing with Google+ [#2464](https://github.com/FreshRSS/FreshRSS/pull/2464)
 
 
 ## 2019-07-25 FreshRSS 1.14.3
@@ -24,7 +46,7 @@
 	* Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438), [#2455](https://github.com/FreshRSS/FreshRSS/pull/2455)
 	* Docker: Add a version for ARM architecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436)
 	* Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422)
-	* Docker: Alpine image updated to 3.10 with PHP 7.3.8 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+	* Docker: Alpine image updated to 3.10 with PHP 7.3.7 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
 	* Add `hadolint` automatic check of Docker files in Travis [#2456](https://github.com/FreshRSS/FreshRSS/pull/2456)
 * Security
 	* Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391)
-- 
cgit v1.2.3


From 38117df976a5b8776a6df483ac7666895691b832 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 17 Sep 2019 20:28:07 +0200
Subject: Require PHP 5.6+

Discussion
https://github.com/FreshRSS/FreshRSS/pull/2495#issuecomment-531911473
Needed for constant arrays
https://www.php.net/manual/en/migration56.new-features.php which will be
used in https://github.com/FreshRSS/FreshRSS/pull/2522
---
 .travis.yml                                       | 3 ---
 CHANGELOG.md                                      | 2 +-
 README.fr.md                                      | 4 ++--
 README.md                                         | 4 ++--
 app/install.php                                   | 2 +-
 app/views/update/checkInstall.phtml               | 2 +-
 docs/en/admins/02_Installation.md                 | 2 +-
 docs/en/admins/05_Configuring_email_validation.md | 5 +----
 docs/fr/users/01_Installation.md                  | 2 +-
 lib/lib_install.php                               | 2 +-
 lib/lib_rss.php                                   | 4 ++--
 11 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/.travis.yml b/.travis.yml
index 5b0ba705a..aedc526d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,9 +30,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    # PHP 5.5 only runs on Travis in 14.04 (trusty), not 16.04 (xenial)
-    - php: "5.5"
-      dist: trusty
     - php: "7.2"
       env: CHECK_TRANSLATION=yes VALIDATE_STANDARD=no
     - language: node_js
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 443302273..67103374b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 	* New option to display article authors underneath the article title [#2487](https://github.com/FreshRSS/FreshRSS/pull/2487)
 	* Add e-mail capability [#2476](https://github.com/FreshRSS/FreshRSS/pull/2476)
 * Compatibility
-	* Require at least PHP 5.5+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495)
+	* Require at least PHP 5.6+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495)
 * Deployment
 	* Take advantage of `mod_authz_core` instead of `mod_access_compat` when running on Apache 2.4+ [#2461](https://github.com/FreshRSS/FreshRSS/pull/2461)
 	* Docker: Alpine image updated to 3.10 with PHP 7.3.8 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
diff --git a/README.fr.md b/README.fr.md
index ceee48f5b..9644f78de 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -43,7 +43,7 @@ FreshRSS n’est fourni avec aucune garantie.
 * Serveur modeste, par exemple sous Linux ou Windows
 	* Fonctionne même sur un Raspberry Pi 1 avec des temps de réponse < 1s (testé sur 150 flux, 22k articles)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
-* PHP 5.5+ (PHP 7+ recommandé pour de meilleures performances)
+* PHP 5.6+ (PHP 7+ recommandé pour de meilleures performances)
 	* Requis : [cURL](https://secure.php.net/curl), [DOM](https://secure.php.net/dom), [XML](https://secure.php.net/xml), [session](https://secure.php.net/session), [ctype](https://secure.php.net/ctype), et [PDO_MySQL](https://secure.php.net/pdo-mysql) ou [PDO_SQLite](https://secure.php.net/pdo-sqlite) ou [PDO_PGSQL](https://secure.php.net/pdo-pgsql)
 	* Recommandés : [JSON](https://secure.php.net/json), [GMP](https://secure.php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](https://secure.php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](https://secure.php.net/mbstring) (pour le texte Unicode), [iconv](https://secure.php.net/iconv) (pour conversion d’encodages), [ZIP](https://secure.php.net/zip) (pour import/export), [zlib](https://secure.php.net/zlib) (pour les flux compressés)
 * MySQL 5.5.3+ (recommandé) ou équivalent MariaDB, ou SQLite 3.7.4+, ou PostgreSQL 9.2+
@@ -121,7 +121,7 @@ Voir la [documentation de la ligne de commande](cli/README.md) pour plus de dét
 
 ## Contrôle d’accès
 Il est requis pour le mode multi-utilisateur, et recommandé dans tous les cas, de limiter l’accès à votre FreshRSS. Au choix :
-* En utilisant l’identification par formulaire (requiert JavaScript, et PHP 5.5+ recommandé)
+* En utilisant l’identification par formulaire (requiert JavaScript)
 * En utilisant un contrôle d’accès HTTP défini par votre serveur Web
 	* Voir par exemple la [documentation d’Apache sur l’authentification](https://httpd.apache.org/docs/trunk/howto/auth.html)
 		* Créer dans ce cas un fichier `./p/i/.htaccess` avec un fichier `.htpasswd` correspondant.
diff --git a/README.md b/README.md
index 6123ae903..829d0306f 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ FreshRSS comes with absolutely no warranty.
 * Light server running Linux or Windows
 	* It even works on Raspberry Pi 1 with response time under a second (tested with 150 feeds, 22k articles)
 * A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
-* PHP 5.5+ (PHP 7+ recommended for higher performance)
+* PHP 5.6+ (PHP 7+ recommended for higher performance)
 	* Required extensions: [cURL](https://secure.php.net/curl), [DOM](https://secure.php.net/dom), [XML](https://secure.php.net/xml), [session](https://secure.php.net/session), [ctype](https://secure.php.net/ctype), and [PDO_MySQL](https://secure.php.net/pdo-mysql) or [PDO_SQLite](https://secure.php.net/pdo-sqlite) or [PDO_PGSQL](https://secure.php.net/pdo-pgsql)
 	* Recommended extensions: [JSON](https://secure.php.net/json), [GMP](https://secure.php.net/gmp) (for API access on 32-bit platforms), [IDN](https://secure.php.net/intl.idn) (for Internationalized Domain Names), [mbstring](https://secure.php.net/mbstring) (for Unicode strings), [iconv](https://secure.php.net/iconv) (for charset conversion), [ZIP](https://secure.php.net/zip) (for import/export), [zlib](https://secure.php.net/zlib) (for compressed feeds)
 * MySQL 5.5.3+ (recommended) or MariaDB equivalent, or SQLite 3.7.4+, or PostgreSQL 9.2+
@@ -121,7 +121,7 @@ See more commands and git commands in the [Command-Line Interface documentation]
 
 ## Access control
 This is needed if you will be using the multi-user mode, to limit access to FreshRSS. Options Available:
-* form authentication (needs JavaScript, and PHP 5.5+ recommended)
+* form authentication (needs JavaScript)
 * HTTP authentication supported by your web server
 	* See [Apache documentation](https://httpd.apache.org/docs/trunk/howto/auth.html)
 		* In that case, create a `./p/i/.htaccess` file with a matching `.htpasswd` file.
diff --git a/app/install.php b/app/install.php
index a92394d2a..47ec1a8a9 100644
--- a/app/install.php
+++ b/app/install.php
@@ -432,7 +432,7 @@ function printStep1() {
 	<?php if ($res['php'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.php.ok', PHP_VERSION); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.php.nok', PHP_VERSION, '5.5.0'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.php.nok', PHP_VERSION, '5.6.0'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['minz'] == 'ok') { ?>
diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml
index e719e53dd..7ebbae869 100644
--- a/app/views/update/checkInstall.phtml
+++ b/app/views/update/checkInstall.phtml
@@ -9,7 +9,7 @@
 	<p class="alert <?php echo $status ? 'alert-success' : 'alert-error'; ?>">
 		<?php
 			if ($key === 'php') {
-				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.5.0');
+				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'), PHP_VERSION, '5.6.0');
 			} else {
 				echo _t('admin.check_install.' . $key . '.' . ($status ? 'ok' : 'nok'));
 			}
diff --git a/docs/en/admins/02_Installation.md b/docs/en/admins/02_Installation.md
index 375b68044..0433ccaf2 100644
--- a/docs/en/admins/02_Installation.md
+++ b/docs/en/admins/02_Installation.md
@@ -7,7 +7,7 @@ You need to verify that your server can run FreshRSS before installing it. If yo
 | Software    | Recommended      | Works also with               |
 | ----------- | ---------------- | ----------------------------- |
 | Web server  | **Apache 2**     | Nginx                         |
-| PHP         | **PHP 7+**       | PHP 5.5+                      |
+| PHP         | **PHP 7+**       | PHP 5.6+                      |
 | PHP modules | Required: libxml, cURL, PDO_MySQL, PCRE and ctype. <br>Required (32-bit only): GMP <br> Recommanded: JSON, Zlib, mbstring, iconv, ZipArchive <br> *For the whole modules list see [Dockerfile](https://github.com/FreshRSS/FreshRSS/blob/master/Docker/Dockerfile-Alpine#L7-L9)* | |
 | Database    | **MySQL 5.5.3+** | SQLite 3.7.4+                 |
 | Browser     | **Firefox**      | Chrome, Opera, Safari, or IE11+ |
diff --git a/docs/en/admins/05_Configuring_email_validation.md b/docs/en/admins/05_Configuring_email_validation.md
index 6cc9ca8f5..fe073545c 100644
--- a/docs/en/admins/05_Configuring_email_validation.md
+++ b/docs/en/admins/05_Configuring_email_validation.md
@@ -6,8 +6,6 @@ by default so you'll have to follow these few steps to verify email addresses.
 It is intended to administrators who host users and want to be sure to be able
 to contact them.
 
-Note that this feature only works with PHP >= 5.5.
-
 ## Force email validation
 
 In your `data/config.php` file, you'll find a `force_email_validation` item:
@@ -15,8 +13,7 @@ set it to `true`. An email field now appears on the registration page and
 emails are sent when users change their email.
 
 You can also enable this feature directly in FreshRSS: `Administration` >
-`System configuration` > check `Force email addresses validation`. If the
-option doesn't appear, it means that you use PHP < 5.5.
+`System configuration` > check `Force email addresses validation`.
 
 ## Configure the SMTP server
 
diff --git a/docs/fr/users/01_Installation.md b/docs/fr/users/01_Installation.md
index f90d52c54..619bce11b 100644
--- a/docs/fr/users/01_Installation.md
+++ b/docs/fr/users/01_Installation.md
@@ -7,7 +7,7 @@ Il est toutefois de votre responsabilité de vérifier que votre hébergement pe
  | Logiciel         | Recommandé                                                                                                     | Fonctionne aussi avec          |
  | --------         | -----------                                                                                                    | ---------------------          |
  | Serveur web      | **Apache 2**                                                                                                   | Nginx                          |
- | PHP              | **PHP 7+**                                                                                                     | PHP 5.5+                       |
+ | PHP              | **PHP 7+**                                                                                                     | PHP 5.6+                       |
  | Modules PHP      | Requis : libxml, cURL, PDO_MySQL, PCRE et ctype<br>Requis (32 bits seulement) : GMP<br>Recommandé : JSON, Zlib, mbstring et iconv, ZipArchive<br>*Pour une liste complète des modules nécessaires voir le [Dockerfile](https://github.com/FreshRSS/FreshRSS/blob/master/Docker/Dockerfile-Alpine#L7-L9)* |                                |
  | Base de données  | **MySQL 5.5.3+**                                                                                               | SQLite 3.7.4+                  |
  | Navigateur       | **Firefox**                                                                                                    | Chrome, Opera, Safari, or IE 11+ |
diff --git a/lib/lib_install.php b/lib/lib_install.php
index 6b9b33240..17defccf6 100644
--- a/lib/lib_install.php
+++ b/lib/lib_install.php
@@ -6,7 +6,7 @@ Minz_Configuration::register('default_system', join_path(FRESHRSS_PATH, 'config.
 Minz_Configuration::register('default_user', join_path(FRESHRSS_PATH, 'config-user.default.php'));
 
 function checkRequirements($dbType = '') {
-	$php = version_compare(PHP_VERSION, '5.5.0') >= 0;
+	$php = version_compare(PHP_VERSION, '5.6.0') >= 0;
 	$minz = file_exists(join_path(LIB_PATH, 'Minz'));
 	$curl = extension_loaded('curl');
 	$pdo_mysql = extension_loaded('pdo_mysql');
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 03cfb82ad..b810e1296 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -1,6 +1,6 @@
 <?php
-if (version_compare(PHP_VERSION, '5.5.0', '<')) {
-	die('FreshRSS error: FreshRSS requires PHP 5.5.0+!');
+if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+	die('FreshRSS error: FreshRSS requires PHP 5.6.0+!');
 }
 
 if (!function_exists('json_decode')) {	//PHP bug #63520 < PHP 7
-- 
cgit v1.2.3


From 87e20ea29069329eb916a8db90bbdd0357a7dbef Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 17 Sep 2019 20:30:10 +0200
Subject: Changelog 2527

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67103374b..f3fd6b3fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 	* New option to display article authors underneath the article title [#2487](https://github.com/FreshRSS/FreshRSS/pull/2487)
 	* Add e-mail capability [#2476](https://github.com/FreshRSS/FreshRSS/pull/2476)
 * Compatibility
-	* Require at least PHP 5.6+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495)
+	* Require at least PHP 5.6+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495), [#2527](https://github.com/FreshRSS/FreshRSS/pull/2527)
 * Deployment
 	* Take advantage of `mod_authz_core` instead of `mod_access_compat` when running on Apache 2.4+ [#2461](https://github.com/FreshRSS/FreshRSS/pull/2461)
 	* Docker: Alpine image updated to 3.10 with PHP 7.3.8 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
-- 
cgit v1.2.3


From ba39332661386ac4accb3cbfd92b201ea68effd9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 28 Sep 2019 12:51:04 +0200
Subject: Changelog

---
 CHANGELOG.md | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3fd6b3fa..6a3670102 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,29 +1,45 @@
 # FreshRSS changelog
 
-## 2019-XX-XX FreshRSS 1.14.4-dev
+## 2019-1X-XX FreshRSS 1.14.4-dev
 
+* CLI
+	* Command line to export/import any database to/from SQLite [#2496](https://github.com/FreshRSS/FreshRSS/pull/2496)
 * Features
 	* New option to display article authors underneath the article title [#2487](https://github.com/FreshRSS/FreshRSS/pull/2487)
-	* Add e-mail capability [#2476](https://github.com/FreshRSS/FreshRSS/pull/2476)
+	* Add e-mail capability [#2476](https://github.com/FreshRSS/FreshRSS/pull/2476), [#2481](https://github.com/FreshRSS/FreshRSS/pull/2481)
+	* Ability to define default user settings in `data/config-user.custom.php` [#2490](https://github.com/FreshRSS/FreshRSS/pull/2490)
+		* Including default feeds [#2515](https://github.com/FreshRSS/FreshRSS/pull/2515)
+	* Add support for terms of service [#2520](https://github.com/FreshRSS/FreshRSS/pull/2520)
+	* Add sharing with [Lemmy](https://github.com/dessalines/lemmy) [#2510](https://github.com/FreshRSS/FreshRSS/pull/2510)
 * Compatibility
 	* Require at least PHP 5.6+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495), [#2527](https://github.com/FreshRSS/FreshRSS/pull/2527)
+	* Require `php-json` and remove remove `JSON.php` fallback [#2528](https://github.com/FreshRSS/FreshRSS/pull/2528)
 * Deployment
 	* Take advantage of `mod_authz_core` instead of `mod_access_compat` when running on Apache 2.4+ [#2461](https://github.com/FreshRSS/FreshRSS/pull/2461)
 	* Docker: Alpine image updated to 3.10 with PHP 7.3.8 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+	* Git ignore `themes/xTheme-*` [#2511](https://github.com/FreshRSS/FreshRSS/pull/2511)
+	* New environment variable `FRESHRSS_ENV` to control Minz development mode [#2508](https://github.com/FreshRSS/FreshRSS/pull/2508)
 * Bug fixing
 	* Fix missing PHP `opcache` package in Docker Alpine [#2498](https://github.com/FreshRSS/FreshRSS/pull/2498)
+	* Fix IE11 / Edge keyboard compatibility [#2507](https://github.com/FreshRSS/FreshRSS/pull/2507)
 * Security
 	* Fix referrer vulnerability when opening an article original link with a shortcut [#2506](https://github.com/FreshRSS/FreshRSS/pull/2506)
 	* Slight refactoring of access check [#2471](https://github.com/FreshRSS/FreshRSS/pull/2471)
+* UI
+	* Optimize dynamic favicon for HiDPI screens [#2539](https://github.com/FreshRSS/FreshRSS/pull/2539)
+	* Hide the admin checkbox if user is not admin [#2531](https://github.com/FreshRSS/FreshRSS/pull/2531)
 * I18n
-	* Improve Dutch [#2503](https://github.com/FreshRSS/FreshRSS/pull/2503)
 	* Add Slovak [#2497](https://github.com/FreshRSS/FreshRSS/pull/2497)
+	* Improve Dutch [#2503](https://github.com/FreshRSS/FreshRSS/pull/2503)
+	* Improve Occitan [#2519](https://github.com/FreshRSS/FreshRSS/pull/2519)
 * Extensions
 	* Additional hooks [#2482](https://github.com/FreshRSS/FreshRSS/pull/2482)
 	* New call to change the layout [#2467](https://github.com/FreshRSS/FreshRSS/pull/2467)
 * Misc.
 	* Automatic check of CSS syntax in Travis CI [#2477](https://github.com/FreshRSS/FreshRSS/pull/2477)
 	* Remove support for sharing with Google+ [#2464](https://github.com/FreshRSS/FreshRSS/pull/2464)
+	* Redirect connected users accessing registration page [#2530](https://github.com/FreshRSS/FreshRSS/pull/2530)
+	* Add Makefile [#2481](https://github.com/FreshRSS/FreshRSS/pull/2481)
 
 
 ## 2019-07-25 FreshRSS 1.14.3
-- 
cgit v1.2.3


From 823f5815237af3b17ce24c6f224c8624dab6cc92 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 28 Sep 2019 23:16:21 +0200
Subject: Document Reeder compatibility (#2540)

https://github.com/FreshRSS/FreshRSS/issues/2513
https://github.com/FreshRSS/FreshRSS/pull/2526
---
 CHANGELOG.md                      |  6 ++++--
 README.fr.md                      |  9 +++++----
 README.md                         |  9 +++++----
 docs/en/users/06_Fever_API.md     | 10 +++++-----
 docs/en/users/06_Mobile_access.md |  2 ++
 docs/fr/users/06_Fever_API.md     | 10 +++++-----
 docs/fr/users/06_Mobile_access.md |  3 +++
 7 files changed, 29 insertions(+), 20 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a3670102..9aa49aafe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 		* Including default feeds [#2515](https://github.com/FreshRSS/FreshRSS/pull/2515)
 	* Add support for terms of service [#2520](https://github.com/FreshRSS/FreshRSS/pull/2520)
 	* Add sharing with [Lemmy](https://github.com/dessalines/lemmy) [#2510](https://github.com/FreshRSS/FreshRSS/pull/2510)
+* API
+	* Add support for [Reeder-4](https://www.reederapp.com/) client [#2513](https://github.com/FreshRSS/FreshRSS/issues/2513)
 * Compatibility
 	* Require at least PHP 5.6+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495), [#2527](https://github.com/FreshRSS/FreshRSS/pull/2527)
 	* Require `php-json` and remove remove `JSON.php` fallback [#2528](https://github.com/FreshRSS/FreshRSS/pull/2528)
@@ -322,8 +324,8 @@
 
 * API
 	* Add support for Fever compatible API, enabling more clients [#1406](https://github.com/FreshRSS/FreshRSS/pull/1406)
-		* iOS: [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303), [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153)
-		* MacOS: [Readkit](https://itunes.apple.com/app/readkit/id588726889)
+		* iOS: [Fiery Feeds](https://apps.apple.com/app/fiery-feeds-rss-reader/id1158763303), [Unread](https://apps.apple.com/app/unread-rss-reader/id1252376153)
+		* MacOS: [Readkit](https://apps.apple.com/app/readkit/id588726889)
 * Features
 	* Several per-feed options (implemented in JSON) [#1838](https://github.com/FreshRSS/FreshRSS/pull/1838)
 		* Mark updated articles as read [#891](https://github.com/FreshRSS/FreshRSS/issues/891)
diff --git a/README.fr.md b/README.fr.md
index 2f57b1234..78e4ed8de 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -187,6 +187,8 @@ Tout client supportant une API de type Google Reader ; Sélection :
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Libre, [F-Droid](https://f-droid.org/fr/packages/org.freshrss.easyrss/))
 * GNU/Linux
 	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Libre)
+* iOS
+	* [Reeder-4](https://www.reederapp.com/) (Commercial)
 * MacOS
 	* [Vienna RSS](http://www.vienna-rss.com/) (Libre)
 
@@ -199,11 +201,10 @@ Tout client supportant une API de type Fever ; Sélection :
 * Android
 	* [Readably](https://play.google.com/store/apps/details?id=com.isaiasmatewos.readably) (Propriétaire)
 * iOS
-	* [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Propriétaire)
-	* [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) (Propriétaire)
-	* [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) (Propriétaire)
+	* [Fiery Feeds](https://apps.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Propriétaire)
+	* [Unread](https://apps.apple.com/app/unread-rss-reader/id1252376153) (Commercial)
 * MacOS
-	* [Readkit](https://itunes.apple.com/app/readkit/id588726889) (Propriétaire)
+	* [Readkit](https://apps.apple.com/app/readkit/id588726889) (Commercial)
 
 
 # Bibliothèques incluses
diff --git a/README.md b/README.md
index 223970d97..73d90b944 100644
--- a/README.md
+++ b/README.md
@@ -187,6 +187,8 @@ Supported clients are:
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Open source, [F-Droid](https://f-droid.org/packages/org.freshrss.easyrss/))
 * GNU/Linux
 	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Open source)
+* iOS
+	* [Reeder-4](https://www.reederapp.com/) (Commercial)
 * MacOS
 	* [Vienna RSS](http://www.vienna-rss.com/) (Open source)
 
@@ -199,11 +201,10 @@ Supported clients are:
 * Android
 	* [Readably](https://play.google.com/store/apps/details?id=com.isaiasmatewos.readably) (Closed source)
 * iOS
-	* [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Closed source)
-	* [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) (Closed source)
-	* [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) (Closed source)
+	* [Fiery Feeds](https://apps.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Closed source)
+	* [Unread](https://apps.apple.com/app/unread-rss-reader/id1252376153) (Commercial)
 * MacOS
-	* [Readkit](https://itunes.apple.com/app/readkit/id588726889) (Closed source)
+	* [Readkit](https://apps.apple.com/app/readkit/id588726889) (Commercial)
 
 
 # Included libraries
diff --git a/docs/en/users/06_Fever_API.md b/docs/en/users/06_Fever_API.md
index b895d4eae..d231c9fc5 100644
--- a/docs/en/users/06_Fever_API.md
+++ b/docs/en/users/06_Fever_API.md
@@ -21,15 +21,15 @@ Then point your mobile application to the URL of `fever.php` (e.g. `https://fres
 Tested with:
 
 - Android
-  - [Readably](https://play.google.com/store/apps/details?id=com.isaiasmatewos.readably)
+  - [Readably](https://play.google.com/store/apps/details?id=com.isaiasmatewos.readably) (Closed source)
 
 - iOS
-  - [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303)
-  - [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153)
-  - [Reeder-4](https://itunes.apple.com/app/reeder-4/id1449412357)
+  - [Fiery Feeds](https://apps.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Closed source)
+  - [Unread](https://apps.apple.com/app/unread-rss-reader/id1252376153) (Commercial)
+  - [Reeder](https://www.reederapp.com/) (Commercial) (Use its Google Reader API option instead)
 
 - MacOS
-  - [Readkit](https://itunes.apple.com/app/readkit/id588726889)
+  - [Readkit](https://apps.apple.com/app/readkit/id588726889) (Commercial)
 
 
 ## Features
diff --git a/docs/en/users/06_Mobile_access.md b/docs/en/users/06_Mobile_access.md
index be4d0ded2..a131d76c3 100644
--- a/docs/en/users/06_Mobile_access.md
+++ b/docs/en/users/06_Mobile_access.md
@@ -53,6 +53,8 @@ See the [page about the Fever compatible API](06_Fever_API.md) for another possi
 		* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Open source, [F-Droid](https://f-droid.org/packages/org.freshrss.easyrss/))
 	* Linux
 		* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Open source)
+	* iOS
+		* [Reeder-4](https://apps.apple.com/app/reeder-4/id1449412357) (Commercial)
 	* MacOS
 		* [Vienna RSS](http://www.vienna-rss.com/) (Open source)
 	* Firefox
diff --git a/docs/fr/users/06_Fever_API.md b/docs/fr/users/06_Fever_API.md
index fb15e596b..c3623b341 100644
--- a/docs/fr/users/06_Fever_API.md
+++ b/docs/fr/users/06_Fever_API.md
@@ -8,15 +8,15 @@ et des généralités sur l’accès par API.
 Testé avec:
 
 - Android
-  [Readably](https://play.google.com/store/apps/details?id=com.isaiasmatewos.readably)
+  [Readably](https://play.google.com/store/apps/details?id=com.isaiasmatewos.readably) (Propriétaire)
 
 - 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)
+  - [Fiery Feeds](https://apps.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Propriétaire)
+  - [Unread](https://apps.apple.com/app/unread-rss-reader/id1252376153) (Commercial)
+  - [Reeder](https://www.reederapp.com/) (Commercial) (Connectez-vous plutôt par son option Google Reader API)
 
 - MacOS
-  - [Readkit](https://itunes.apple.com/app/readkit/id588726889)
+  - [Readkit](https://apps.apple.com/app/readkit/id588726889) (Commercial)
 
 ## TODO
 
diff --git a/docs/fr/users/06_Mobile_access.md b/docs/fr/users/06_Mobile_access.md
index 225c55c7c..9f8c64f5c 100644
--- a/docs/fr/users/06_Mobile_access.md
+++ b/docs/fr/users/06_Mobile_access.md
@@ -67,11 +67,14 @@ Tout client supportant une API de type Google Reader. Sélection :
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Libre, F-Droid)
 * Linux
 	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Libre)
+* iOS
+	* [Reeder-4](https://apps.apple.com/app/reeder-4/id1449412357) (Commercial)
 * MacOS
 	* [Vienna RSS](http://www.vienna-rss.com/) (Libre)
 * Firefox
 	* [FreshRSS-Notify](https://addons.mozilla.org/fr/firefox/addon/freshrss-notify-webextension/) (Libre)
 
+
 # API compatible Google Reader
 
 Exemples de requêtes simples :
-- 
cgit v1.2.3


From 37b52b7361d3ac15273ca19a0b96ef74299e759e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 1 Oct 2019 18:12:21 +0200
Subject: Trim whitespace (#2544)

---
 CHANGELOG.md                                      |   4 +-
 Docker/README.md                                  |   2 +-
 app/shares.php                                    |  10 +-
 app/views/helpers/index/normal/entry_header.phtml |  29 +++---
 app/views/index/tos.phtml                         |  20 ++--
 app/views/user/profile.phtml                      |   6 +-
 app/views/user/validateEmail.phtml                |  34 +++----
 cli/README.md                                     |   2 +-
 docs/en/admins/02_Installation.md                 |   2 +-
 docs/en/admins/03_Updating.md                     |   4 +-
 docs/en/contributing.md                           |   2 +-
 docs/en/developers/01_First_steps.md              |  42 ++++-----
 docs/en/developers/03_Backend/05_Extensions.md    | 110 +++++++++++-----------
 docs/en/users/03_Main_view.md                     |  16 ++--
 docs/en/users/05_Configuration.md                 |   2 +-
 docs/en/users/07_Frequently_Asked_Questions.md    |   2 +-
 docs/fr/developers/01_First_steps.md              |  40 ++++----
 docs/fr/developers/03_Backend/05_Extensions.md    |  78 +++++++--------
 docs/fr/users/06_Mobile_access.md                 |   4 +-
 docs/fr/users/07_Frequently_Asked_Questions.md    |   4 +-
 lib/Minz/ModelPdo.php                             |   6 +-
 21 files changed, 209 insertions(+), 210 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9aa49aafe..e68c9a2fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -522,7 +522,7 @@
 	* Simplified Chinese [#1541](https://github.com/FreshRSS/FreshRSS/pull/1541)
 	* Improve English [#1465](https://github.com/FreshRSS/FreshRSS/pull/1465)
 	* Improve Dutch [#1559](https://github.com/FreshRSS/FreshRSS/pull/1559)
-	* Added Spanish language [#1631] (https://github.com/FreshRSS/FreshRSS/pull/1631/) 
+	* Added Spanish language [#1631] (https://github.com/FreshRSS/FreshRSS/pull/1631/)
 * Security
 	* Do not require write access to check availability of new versions [#1450](https://github.com/FreshRSS/FreshRSS/issues/1450)
 * Misc.
@@ -548,7 +548,7 @@
 	* New command `./cli/reconfigure.php` to update an existing installation [#1439](https://github.com/FreshRSS/FreshRSS/pull/1439)
 	* Many CLI improvements [#1447](https://github.com/FreshRSS/FreshRSS/pull/1447)
 		* More information (number of feeds, articles, etc.) in `./cli/user-info.php`
-		* Better idempotency of `./cli/do-install.php` and language parameter [#1449](https://github.com/FreshRSS/FreshRSS/issues/1449) 
+		* Better idempotency of `./cli/do-install.php` and language parameter [#1449](https://github.com/FreshRSS/FreshRSS/issues/1449)
 * Bug fixing
 	* Fix several CLI issues [#1445](https://github.com/FreshRSS/FreshRSS/issues/1445)
 		* Fix CLI install bugs with SQLite [#1443](https://github.com/FreshRSS/FreshRSS/issues/1443), [#1448](https://github.com/FreshRSS/FreshRSS/issues/1448)
diff --git a/Docker/README.md b/Docker/README.md
index 4146a57dd..13988a316 100644
--- a/Docker/README.md
+++ b/Docker/README.md
@@ -48,7 +48,7 @@ docker run -d --restart unless-stopped --log-opt max-size=10m \
 See [more information about Docker and Let’s Encrypt in Træfik](https://docs.traefik.io/user-guide/docker-and-lets-encrypt/).
 
 
-## Run FreshRSS 
+## Run FreshRSS
 Example using the built-in refresh cron job (see further below for alternatives).
 You must first chose a domain (DNS) or sub-domain, e.g. `freshrss.example.net`.
 
diff --git a/app/shares.php b/app/shares.php
index 71860c9e3..9df83617a 100644
--- a/app/shares.php
+++ b/app/shares.php
@@ -139,9 +139,9 @@ return array(
 		'method' => 'GET',
 	),
 	'lemmy' => array(
-                'url' => '~URL~/create_post?url=~LINK~&name=~TITLE~',
-                'transform' => array('rawurlencode'),
-                'form' => 'advanced',
-                'method' => 'GET',
-        ),
+		'url' => '~URL~/create_post?url=~LINK~&name=~TITLE~',
+		'transform' => array('rawurlencode'),
+		'form' => 'advanced',
+		'method' => 'GET',
+	),
 );
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
index 7873b16e4..82c209bb2 100644
--- a/app/views/helpers/index/normal/entry_header.phtml
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -28,21 +28,20 @@
 		}
 	}
 	?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><img class="favicon" src="<?php echo $this->feed->favicon(); ?>" alt="✇" /> <span><?php echo $this->feed->name(); ?></span></a></li>
-        <li class="item title"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a><?php
-		if ($topline_display_authors) {
-                    ?><div class="item author">
-                    <?php 
-                    $authors = $this->entry->authors();
-                    if (is_array($authors)):
-                            $first = true;
-                            foreach ($authors as $author):
-                                    echo $first ? $author : ', ' . $author;
-                                    $first = false;
-                            endforeach;
-                    endif;		
-                    ?></div><?php
-                }
-        ?></li>
+	<li class="item title"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a><?php
+		if ($topline_display_authors):
+			?><div class="item author"><?php
+			$authors = $this->entry->authors();
+			if (is_array($authors)) {
+				$first = true;
+				foreach ($authors as $author) {
+					echo $first ? $author : ', ' . $author;
+					$first = false;
+				}
+			}
+			?></div><?php
+		endif;
+	?></li>
 	<?php if ($topline_date) { ?><li class="item date"><?php echo $this->entry->date(); ?> </li><?php } ?>
 	<?php if ($topline_link) { ?><li class="item link"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
 </ul>
diff --git a/app/views/index/tos.phtml b/app/views/index/tos.phtml
index 79c597244..1b3498134 100644
--- a/app/views/index/tos.phtml
+++ b/app/views/index/tos.phtml
@@ -1,13 +1,13 @@
 <div class="post content">
-    <?php if ($this->can_register) { ?>
-        <a href="<?php echo _url('auth', 'register'); ?>">
-            <?php echo _t('gen.action.back'); ?>
-        </a>
-    <?php } else { ?>
-        <a href="<?php echo _url('index', 'index'); ?>">
-            <?php echo _t('gen.action.back'); ?>
-        </a>
-    <?php } ?>
+	<?php if ($this->can_register) { ?>
+		<a href="<?php echo _url('auth', 'register'); ?>">
+			<?php echo _t('gen.action.back'); ?>
+		</a>
+	<?php } else { ?>
+		<a href="<?php echo _url('index', 'index'); ?>">
+			<?php echo _t('gen.action.back'); ?>
+		</a>
+	<?php } ?>
 
-    <?php echo $this->terms_of_service; ?>
+	<?php echo $this->terms_of_service; ?>
 </div>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index df43642dd..de717b36e 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -1,7 +1,7 @@
 <?php
-    if (!$this->disable_aside) {
-        $this->partial('aside_configure');
-    }
+	if (!$this->disable_aside) {
+		$this->partial('aside_configure');
+	}
 ?>
 
 <div class="post">
diff --git a/app/views/user/validateEmail.phtml b/app/views/user/validateEmail.phtml
index a246c222e..51517f5eb 100644
--- a/app/views/user/validateEmail.phtml
+++ b/app/views/user/validateEmail.phtml
@@ -1,22 +1,22 @@
 <div class="post">
-    <p>
-        <?php echo _t('user.email.validation.need_to', FreshRSS_Context::$system_conf->title); ?>
-    </p>
+	<p>
+		<?php echo _t('user.email.validation.need_to', FreshRSS_Context::$system_conf->title); ?>
+	</p>
 
-    <p>
-        <?php echo _t('user.email.validation.email_sent_to', FreshRSS_Context::$user_conf->mail_login); ?>
-    </p>
+	<p>
+		<?php echo _t('user.email.validation.email_sent_to', FreshRSS_Context::$user_conf->mail_login); ?>
+	</p>
 
-    <form action="<?php echo _url('user', 'sendValidationEmail'); ?>" method="post">
-        <input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
-        <button type="submit" class="btn">
-            <?php echo _t('user.email.validation.resend_email'); ?>
-        </button>
-    </form>
+	<form action="<?php echo _url('user', 'sendValidationEmail'); ?>" method="post">
+		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
+		<button type="submit" class="btn">
+			<?php echo _t('user.email.validation.resend_email'); ?>
+		</button>
+	</form>
 
-    <p>
-        <small>
-            <?php echo _t('user.email.validation.change_email', _url('user', 'profile')); ?>
-        </small>
-    </p>
+	<p>
+		<small>
+			<?php echo _t('user.email.validation.change_email', _url('user', 'profile')); ?>
+		</small>
+	</p>
 </div>
diff --git a/cli/README.md b/cli/README.md
index 35c9bad9b..89b440a39 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -128,4 +128,4 @@ Example to get the number of feeds of a given user:
 # Install and updates
 
 If you want to administrate FreshRSS using git, please read our [installation docs](https://freshrss.github.io/FreshRSS/en/admins/02_Installation.html)
-and [update guidelines](https://freshrss.github.io/FreshRSS/en/admins/03_Updating.html). 
+and [update guidelines](https://freshrss.github.io/FreshRSS/en/admins/03_Updating.html).
diff --git a/docs/en/admins/02_Installation.md b/docs/en/admins/02_Installation.md
index 446ef0dcf..7bba647ec 100644
--- a/docs/en/admins/02_Installation.md
+++ b/docs/en/admins/02_Installation.md
@@ -137,7 +137,7 @@ A step-by-step tutorial is available [in French](http://www.pihomeserver.fr/2013
 
 # Security
 
-Make sure to expose only the `./p/` folder on the web, the other directories contain personal and sensitive data. 
+Make sure to expose only the `./p/` folder on the web, the other directories contain personal and sensitive data.
 See the Apache and nginx config examples above.
 
 **TODO**
diff --git a/docs/en/admins/03_Updating.md b/docs/en/admins/03_Updating.md
index 4e1fdfa5d..461366049 100644
--- a/docs/en/admins/03_Updating.md
+++ b/docs/en/admins/03_Updating.md
@@ -15,7 +15,7 @@ The update process depends on your installation type, see below:
 
 Change to your installation at http://localhost/FreshRSS/p/i/?c=update and hit the "Check for new updates" button.
 
-If there is a new version you will be prompted again. 
+If there is a new version you will be prompted again.
 
 
 ## Using git
@@ -72,7 +72,7 @@ cd /usr/share/FreshRSS
 ```
 
 Commands intended to be executed in order (you can c/p the whole block if desired):
-                            
+
 ```sh
 wget https://github.com/FreshRSS/FreshRSS/archive/master.zip
 unzip master.zip
diff --git a/docs/en/contributing.md b/docs/en/contributing.md
index 45c1650fb..870e0c14f 100644
--- a/docs/en/contributing.md
+++ b/docs/en/contributing.md
@@ -52,5 +52,5 @@ We are working on a better way to handle internationalization but don't hesitate
 
 ## Contribute to documentation
 
-The documentation needs a lot of improvements in order to be more useful to new contributors and we are working on it. 
+The documentation needs a lot of improvements in order to be more useful to new contributors and we are working on it.
 If you want to give some help, meet us in the main repositories [docs directory](https://github.com/FreshRSS/FreshRSS/tree/master/docs)!
diff --git a/docs/en/developers/01_First_steps.md b/docs/en/developers/01_First_steps.md
index 6b7f437a7..28c249be4 100644
--- a/docs/en/developers/01_First_steps.md
+++ b/docs/en/developers/01_First_steps.md
@@ -61,7 +61,7 @@ The `TAG` variable can be anything (e.g. `dev-local`). You can target a specific
 
 # Extensions
 
-If you want to create your own FreshRSS extension, take a look at the [extension documentation](03_Backend/05_Extensions.md).  
+If you want to create your own FreshRSS extension, take a look at the [extension documentation](03_Backend/05_Extensions.md).
 
 # Coding style
 
@@ -110,7 +110,7 @@ There is a space before and after every operator.
 
 ```php
 if ($a == 10) {
-    // do something
+	// do something
 }
 
 echo $a ? 1 : 0;
@@ -122,11 +122,11 @@ There is no spaces in the brackets. There is no space before the opening bracket
 
 ```php
 if ($a == 10) {
-    // do something
+	// do something
 }
 
 if ((int)$a == 10) {
-    // do something
+	// do something
 }
 ```
 
@@ -137,16 +137,16 @@ It happens most of the time in Javascript files. When there is chained functions
 ```javascript
 // First instruction
 shortcut.add(shortcuts.mark_read, function () {
-        //...
-    }, {
-        'disable_in_input': true
-    });
+		//...
+	}, {
+		'disable_in_input': true
+	});
 // Second instruction
 shortcut.add("shift+" + shortcuts.mark_read, function () {
-        //...
-    }, {
-        'disable_in_input': true
-    });
+		//...
+	}, {
+		'disable_in_input': true
+	});
 ```
 
 ## Line length
@@ -158,7 +158,7 @@ With functions, parameters can be declared on different lines.
 ```php
 function my_function($param_1, $param_2,
                      $param_3, $param_4) {
-    // do something
+	// do something
 }
 ```
 
@@ -173,7 +173,7 @@ They must follow the "snake case" convention.
 ```php
 // a function
 function function_name() {
-    // do something
+	// do something
 }
 // a variable
 $variable_name;
@@ -185,7 +185,7 @@ They must follow the "lower camel case" convention.
 
 ```php
 private function methodName() {
-    // do something
+	// do something
 }
 ```
 
@@ -213,7 +213,7 @@ They must be at the end of the line if a condition runs on more than one line.
 ```php
 if ($a == 10 ||
     $a == 20) {
-    // do something
+	// do something
 }
 ```
 
@@ -226,9 +226,9 @@ If the file contains only PHP code, the PHP closing tag must be omitted.
 If an array declaration runs on more than one line, each element must be followed by a comma even the last one.
 
 ```php
-$variable = array(
-    "value 1",
-    "value 2",
-    "value 3",
-);
+$variable = [
+	"value 1",
+	"value 2",
+	"value 3",
+];
 ```
diff --git a/docs/en/developers/03_Backend/05_Extensions.md b/docs/en/developers/03_Backend/05_Extensions.md
index 7c1f8c046..0cfa5c8b7 100644
--- a/docs/en/developers/03_Backend/05_Extensions.md
+++ b/docs/en/developers/03_Backend/05_Extensions.md
@@ -48,13 +48,13 @@ Code example:
 <?php
 
 class FreshRSS_hello_Controller extends Minz_ActionController {
-    public function indexAction() {
-        $this->view->a_variable = 'FooBar';
-    }
+	public function indexAction() {
+		$this->view->a_variable = 'FooBar';
+	}
 
-    public function worldAction() {
-        $this->view->a_variable = 'Hello World!';
-    }
+	public function worldAction() {
+		$this->view->a_variable = 'Hello World!';
+	}
 }
 
 ?>
@@ -74,7 +74,7 @@ As explained above, the views consist of HTML mixed with PHP. Code example:
 
 ```html
 <p>
-    This is a parameter passed from the controller: <?php echo $this->a_variable; ?>
+	This is a parameter passed from the controller: <?php echo $this->a_variable; ?>
 </p>
 ```
 
@@ -119,7 +119,7 @@ To take full advantage of the Minz routing system, it is strongly discouraged to
 
 ```html
 <p>
-    Go to page <a href="http://example.com?c=hello&amp;a=world">Hello world</a>!
+	Go to page <a href="http://example.com?c=hello&amp;a=world">Hello world</a>!
 </p>
 ```
 
@@ -130,13 +130,13 @@ So use the `Minz_Url` class and its `display()` method instead. `Minz_Url::displ
 ```php
 <?php
 
-$url_array = array(
-    'c' => 'hello',
-    'a' => 'world',
-    'params' => array(
-        'foo' => 'bar',
-    )
-);
+$url_array = [
+	'c' => 'hello',
+	'a' => 'world',
+	'params' => [
+		'foo' => 'bar',
+	],
+];
 
 // Show something like .?c=hello&amp;a=world&amp;foo=bar
 echo Minz_Url::display($url_array);
@@ -166,10 +166,10 @@ Code example:
 ```php
 <?php
 
-$url_array = array(
-    'c' => 'hello',
-    'a' => 'world'
-);
+$url_array = [
+	'c' => 'hello',
+	'a' => 'world',
+];
 
 // Tells Minz to redirect the user to the hello / world page.
 // Note that this is a redirection in the Minz sense of the term, not a redirection that the browser will have to manage (HTTP code 301 or 302)
@@ -188,10 +188,10 @@ It is very common to want display a message to the user while performing a redir
 ```php
 <?php
 
-$url_array = array(
-    'c' => 'hello',
-    'a' => 'world'
-);
+$url_array = [
+	'c' => 'hello',
+	'a' => 'world',
+];
 $feedback_good = 'Tout s\'est bien passé !';
 $feedback_bad = 'Oups, quelque chose n\'a pas marché.';
 
@@ -226,18 +226,18 @@ The translation files are quite simple: it is only a matter of returning a PHP t
 <?php
 
 return array(
-    'action' => array(
-        'actualize' => 'Actualiser',
-        'back_to_rss_feeds' => '← Retour à vos flux RSS',
-        'cancel' => 'Annuler',
-        'create' => 'Créer',
-        'disable' => 'Désactiver',
-    ),
-    'freshrss' => array(
-        '_' => 'FreshRSS',
-        'about' => 'À propos de FreshRSS',
-    ),
-);
+	'action' => [
+		'actualize' => 'Actualiser',
+		'back_to_rss_feeds' => '← Retour à vos flux RSS',
+		'cancel' => 'Annuler',
+		'create' => 'Créer',
+		'disable' => 'Désactiver',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'À propos de FreshRSS',
+	),
+];
 
 ?>
 ```
@@ -247,9 +247,9 @@ Code example:
 
 ```html
 <p>
-    <a href="<?php echo _url('index', 'index'); ?>">
-        <?php echo _t('gen.action.back_to_rss_feeds'); ?>
-    </a>
+	<a href="<?php echo _url('index', 'index'); ?>">
+		<?php echo _t('gen.action.back_to_rss_feeds'); ?>
+	</a>
 </p>
 ```
 
@@ -267,8 +267,8 @@ An extension allows you to add functionality easily to FreshRSS without having t
 
 ### Basic files and folders
 
-The first thing to note is that **all** extensions **must** be located in the `extensions` directory, at the base of the FreshRSS tree. 
-An extension is a directory containing a set of mandatory (and optional) files and subdirectories. 
+The first thing to note is that **all** extensions **must** be located in the `extensions` directory, at the base of the FreshRSS tree.
+An extension is a directory containing a set of mandatory (and optional) files and subdirectories.
 The convention requires that the main directory name be preceded by an "x" to indicate that it is not an extension included by default in FreshRSS.
 
 The main directory of an extension must contain at least two **mandatory** files:
@@ -276,16 +276,16 @@ The main directory of an extension must contain at least two **mandatory** files
 - A `metadata.json` file that contains a description of the extension. This file is written in JSON.
 - An `extension.php` file containing the entry point of the extension (which is a class that inherits Minz_Extension).
 
-Please note that there is a not a required link between the directory name of the extension and the name of the class inside `extension.php`, 
-but you should follow our best practice:  
+Please note that there is a not a required link between the directory name of the extension and the name of the class inside `extension.php`,
+but you should follow our best practice:
 If you want to write a `HelloWorld` extension, the directory name should be `xExtension-HelloWorld` and the base class name `HelloWorldExtension`.
 
 In the file `freshrss/extensions/xExtension-HelloWorld/extension.php` you need the structure:
 ```html
 class HelloWorldExtension extends Minz_Extension {
-    public function init() {
-        // your code here
-    }
+	public function init() {
+		// your code here
+	}
 }
 ```
 There is an example HelloWorld extension that you can download from [our GitHub repo](https://github.com/FreshRSS/xExtension-HelloWorld).
@@ -315,14 +315,14 @@ Only the `name` and` entrypoint` fields are required.
 
 ### Choose between « system » or « user »
 
-A __user__ extension can be enabled by some users and not by others (typically for user preferences). 
+A __user__ extension can be enabled by some users and not by others (typically for user preferences).
 
 A __system__ extension in comparison is enabled for every account.
 
 ### Writing your own extension.php
 
-This file is the entry point of your extension. It must contain a specific class to function. 
-As mentioned above, the name of the class must be your `entrypoint` suffixed by` Extension` (`HelloWorldExtension` for example). 
+This file is the entry point of your extension. It must contain a specific class to function.
+As mentioned above, the name of the class must be your `entrypoint` suffixed by` Extension` (`HelloWorldExtension` for example).
 In addition, this class must be inherited from the `Minz_Extension` class to benefit from extensions-specific methods.
 
 Your class will benefit from four methods to redefine:
@@ -351,13 +351,13 @@ You can register at the FreshRSS event system in an extensions `init()` method,
 ```html
 class HelloWorldExtension extends Minz_Extension
 {
-    public function init() {
-        $this->registerHook('entry_before_display', array($this, 'renderEntry'));
-    }
-    public function renderEntry($entry) {
-        $entry->_content('<h1>Hello World</h1>' . $entry->content());
-        return $entry;
-    }
+	public function init() {
+		$this->registerHook('entry_before_display', array($this, 'renderEntry'));
+	}
+	public function renderEntry($entry) {
+		$entry->_content('<h1>Hello World</h1>' . $entry->content());
+		return $entry;
+	}
 }
 ```
 
diff --git a/docs/en/users/03_Main_view.md b/docs/en/users/03_Main_view.md
index 59d051e7e..c6c3e3b50 100644
--- a/docs/en/users/03_Main_view.md
+++ b/docs/en/users/03_Main_view.md
@@ -32,20 +32,20 @@ Here is an example to trigger article update every hour.
 
 Special parameters to configure the script - all parameters can be combined:
 
-- Parameter "force"  
-https://freshrss.example.net/i/?c=feed&a=actualize&force=1  
+- Parameter "force"
+https://freshrss.example.net/i/?c=feed&a=actualize&force=1
 If *force* is set to 1 all feeds will be refreshed at once.
 
-- Parameter "ajax"  
-https://freshrss.example.net/i/?c=feed&a=actualize&ajax=1  
+- Parameter "ajax"
+https://freshrss.example.net/i/?c=feed&a=actualize&ajax=1
 Only a status site is returned and not a complete website. Example: "OK"
 
-- Parameter "maxFeeds"  
-https://freshrss.example.net/i/?c=feed&a=actualize&maxFeeds=30  
+- Parameter "maxFeeds"
+https://freshrss.example.net/i/?c=feed&a=actualize&maxFeeds=30
 If *maxFeeds* is set the configured amount of feeds is refreshed at once. The default setting is "10".
 
-- Parameter "token"  
-https://freshrss.example.net/i/?c=feed&a=actualize&token=542345872345734  
+- Parameter "token"
+https://freshrss.example.net/i/?c=feed&a=actualize&token=542345872345734
 Security parameter to prevent unauthorized refreshes. For detailed Documentation see "Form authentication".
 
 ### Online cron
diff --git a/docs/en/users/05_Configuration.md b/docs/en/users/05_Configuration.md
index 225c1e5f9..f635f9d5e 100644
--- a/docs/en/users/05_Configuration.md
+++ b/docs/en/users/05_Configuration.md
@@ -9,7 +9,7 @@ the missing bits or add a new language, please check how you can [contribute to
 
 There are parts of FreshRSS that are not translated and are not intended to be translated. For now, the logs visible in the application as well as the one generated by automatic update scripts are part of it.
 
-Available languages are: cz, de, en, es, fr, he, it, kr, nl, oc, pt-br, ru, tr, zh-cn. 
+Available languages are: cz, de, en, es, fr, he, it, kr, nl, oc, pt-br, ru, tr, zh-cn.
 
 ## Theme
 
diff --git a/docs/en/users/07_Frequently_Asked_Questions.md b/docs/en/users/07_Frequently_Asked_Questions.md
index 42156b1a9..fd3db4bea 100644
--- a/docs/en/users/07_Frequently_Asked_Questions.md
+++ b/docs/en/users/07_Frequently_Asked_Questions.md
@@ -47,7 +47,7 @@ For more information on that matter, there is a [dedicated documentation](../../
 
 ## Permissions under SELinux
 
-Some Linux distribution like Fedora or RedHat Enterprise Linux have SELinux system enabled. This acts like a firewall application, so all applications cannot write/modify files under certain conditions. While installing FreshRSS, step 2 can fail if the httpd process cannot write to some data sub-directories, the following command should be executed as root : 
+Some Linux distribution like Fedora or RedHat Enterprise Linux have SELinux system enabled. This acts like a firewall application, so all applications cannot write/modify files under certain conditions. While installing FreshRSS, step 2 can fail if the httpd process cannot write to some data sub-directories, the following command should be executed as root :
 ```sh
 semanage fcontext -a -t httpd_sys_rw_content_t '/usr/share/FreshRSS/data(/.*)?'
 restorecon -Rv /usr/share/FreshRSS/data
diff --git a/docs/fr/developers/01_First_steps.md b/docs/fr/developers/01_First_steps.md
index dd38bcb3f..df3fa65f2 100644
--- a/docs/fr/developers/01_First_steps.md
+++ b/docs/fr/developers/01_First_steps.md
@@ -57,7 +57,7 @@ Chaque opérateur est entouré d'espaces.
 
 ```php
 if ($a == 10) {
-    // faire quelque chose
+	// faire quelque chose
 }
 
 echo $a ? 1 : 0;
@@ -69,11 +69,11 @@ Il n'y a pas d'espaces entre des parenthèses. Il n'y a pas d'espaces avant une
 
 ```php
 if ($a == 10) {
-    // faire quelque chose
+	// faire quelque chose
 }
 
 if ((int)$a == 10) {
-    // faire quelque chose
+	// faire quelque chose
 }
 ```
 
@@ -84,16 +84,16 @@ Ce cas se présente le plus souvent en Javascript. Quand on a des fonctions chai
 ```javascript
 // Première instruction
 shortcut.add(shortcuts.mark_read, function () {
-        //...
-    }, {
-        'disable_in_input': true
-    });
+		//...
+	}, {
+		'disable_in_input': true
+	});
 // Deuxième instruction
 shortcut.add("shift+" + shortcuts.mark_read, function () {
-        //...
-    }, {
-        'disable_in_input': true
-    });
+		//...
+	}, {
+		'disable_in_input': true
+	});
 ```
 
 ## Longueur des lignes
@@ -105,7 +105,7 @@ Dans le cas des fonctions, les paramètres peuvent être déclarés sur plusieur
 ```php
 function ma_fonction($param_1, $param_2,
                      $param_3, $param_4) {
-    // faire quelque chose
+	// faire quelque chose
 }
 ```
 
@@ -120,7 +120,7 @@ Les fonctions et les variables doivent suivre la convention "snake case".
 ```php
 // une fontion
 function nom_de_la_fontion() {
-    // faire quelque chose
+	// faire quelque chose
 }
 // une variable
 $nom_de_la_variable;
@@ -132,7 +132,7 @@ Les méthodes doivent suivre la convention "lower camel case".
 
 ```php
 private function nomDeLaMethode() {
-    // faire quelque chose
+	// faire quelque chose
 }
 ```
 
@@ -160,7 +160,7 @@ Les opérateurs doivent être en fin de ligne dans le cas de conditions sur plus
 ```php
 if ($a == 10 ||
     $a == 20) {
-    // faire quelque chose
+	// faire quelque chose
 }
 ```
 
@@ -173,9 +173,9 @@ Si le fichier ne contient que du PHP, il ne doit pas comporter de balise fermant
 Lors de l'écriture de tableaux sur plusieurs lignes, tous les éléments doivent être suivis d'une virgule (même le dernier).
 
 ```php
-$variable = array(
-    "valeur 1",
-    "valeur 2",
-    "valeur 3",
-);
+$variable = [
+	"valeur 1",
+	"valeur 2",
+	"valeur 3",
+];
 ```
diff --git a/docs/fr/developers/03_Backend/05_Extensions.md b/docs/fr/developers/03_Backend/05_Extensions.md
index 2ee81b781..3a23e0c5a 100644
--- a/docs/fr/developers/03_Backend/05_Extensions.md
+++ b/docs/fr/developers/03_Backend/05_Extensions.md
@@ -49,13 +49,13 @@ Exemple de code :
 <?php
 
 class FreshRSS_hello_Controller extends Minz_ActionController {
-    public function indexAction() {
-        $this->view->a_variable = 'FooBar';
-    }
+	public function indexAction() {
+		$this->view->a_variable = 'FooBar';
+	}
 
-    public function worldAction() {
-        $this->view->a_variable = 'Hello World!';
-    }
+	public function worldAction() {
+		$this->view->a_variable = 'Hello World!';
+	}
 }
 
 ?>
@@ -75,7 +75,7 @@ Comme expliqué plus haut, les vues sont du code HTML mixé à du PHP. Exemple d
 
 ```html
 <p>
-    Phrase passée en paramètre : <?php echo $this->a_variable; ?>
+	Phrase passée en paramètre : <?php echo $this->a_variable; ?>
 </p>
 ```
 
@@ -119,7 +119,7 @@ Pour profiter pleinement du système de routage de Minz, il est fortement décon
 
 ```html
 <p>
-    Accéder à la page <a href="http://exemple.com?c=hello&amp;a=world">Hello world</a>!
+	Accéder à la page <a href="http://exemple.com?c=hello&amp;a=world">Hello world</a>!
 </p>
 ```
 
@@ -130,13 +130,13 @@ Préférez donc l'utilisation de la classe `Minz_Url` et de sa méthode `display
 ```php
 <?php
 
-$url_array = array(
-    'c' => 'hello',
-    'a' => 'world',
-    'params' => array(
-        'foo' => 'bar',
-    )
-);
+$url_array = [
+	'c' => 'hello',
+	'a' => 'world',
+	'params' => [
+		'foo' => 'bar',
+	],
+];
 
 // Affichera quelque chose comme .?c=hello&amp;a=world&amp;foo=bar
 echo Minz_Url::display($url_array);
@@ -166,10 +166,10 @@ Exemple de code :
 ```php
 <?php
 
-$url_array = array(
-    'c' => 'hello',
-    'a' => 'world'
-);
+$url_array = [
+	'c' => 'hello',
+	'a' => 'world',
+];
 
 // Indique à Minz de rediriger l'utilisateur vers la page hello/world.
 // Notez qu'il s'agit d'une redirection au sens Minz du terme, pas d'une redirection que le navigateur va avoir à gérer (code HTTP 301 ou 302)
@@ -188,10 +188,10 @@ Il est très fréquent de vouloir effectuer une redirection tout en affichant un
 ```php
 <?php
 
-$url_array = array(
-    'c' => 'hello',
-    'a' => 'world'
-);
+$url_array = [
+	'c' => 'hello',
+	'a' => 'world',
+];
 $feedback_good = 'Tout s\'est bien passé !';
 $feedback_bad = 'Oups, quelque chose n\'a pas marché.';
 
@@ -225,19 +225,19 @@ Les fichiers de traduction sont assez simples : il s'agit seulement de retourne
 ```php
 <?php
 
-return array(
-    'action' => array(
-        'actualize' => 'Actualiser',
-        'back_to_rss_feeds' => '← Retour à vos flux RSS',
-        'cancel' => 'Annuler',
-        'create' => 'Créer',
-        'disable' => 'Désactiver',
-    ),
-    'freshrss' => array(
-        '_' => 'FreshRSS',
-        'about' => 'À propos de FreshRSS',
-    ),
-);
+return [
+	'action' => [
+		'actualize' => 'Actualiser',
+		'back_to_rss_feeds' => '← Retour à vos flux RSS',
+		'cancel' => 'Annuler',
+		'create' => 'Créer',
+		'disable' => 'Désactiver',
+	],
+	'freshrss' => [
+		'_' => 'FreshRSS',
+		'about' => 'À propos de FreshRSS',
+	],
+];
 
 ?>
 ```
@@ -246,9 +246,9 @@ Pour accéder à ces traductions, `Minz_Translate` va nous aider à l'aide de sa
 
 ```html
 <p>
-    <a href="<?php echo _url('index', 'index'); ?>">
-        <?php echo _t('gen.action.back_to_rss_feeds'); ?>
-    </a>
+	<a href="<?php echo _url('index', 'index'); ?>">
+		<?php echo _t('gen.action.back_to_rss_feeds'); ?>
+	</a>
 </p>
 ```
 
diff --git a/docs/fr/users/06_Mobile_access.md b/docs/fr/users/06_Mobile_access.md
index 9f8c64f5c..f637ccf5b 100644
--- a/docs/fr/users/06_Mobile_access.md
+++ b/docs/fr/users/06_Mobile_access.md
@@ -45,7 +45,7 @@ Voir la [page sur l’API compatible Fever](06_Fever_API.md) pour une autre poss
 
 6. Vous pouvez maintenant tester sur une application mobile (News+, FeedMe, ou EasyRSS sur Android)
 	* en utilisant comme adresse https://rss.example.net/api/greader.php ou http://example.net/FreshRSS/p/api/greader.php selon la configuration de votre site Web.
-	* ⚠️ attention aux majuscules et aux espaces en tapant l’adresse avec le clavier du mobile ⚠️ 
+	* ⚠️ attention aux majuscules et aux espaces en tapant l’adresse avec le clavier du mobile ⚠️
 	* avec votre nom d’utilisateur et le mot de passe enregistré au point 2 (mot de passe API).
 
 
@@ -53,7 +53,7 @@ Voir la [page sur l’API compatible Fever](06_Fever_API.md) pour une autre poss
 
  * Vous pouvez voir les logs API dans `./FreshRSS/data/users/_/log_api.txt`
  * Si vous avez une erreur 404 (fichier non trouvé) lors de l’étape de test, et que vous êtes sous Apache,
- voir http://httpd.apache.org/docs/trunk/mod/core.html#allowencodedslashes pour utiliser News+ 
+ voir http://httpd.apache.org/docs/trunk/mod/core.html#allowencodedslashes pour utiliser News+
 (facultatif pour EasyRSS et FeedMe qui devraient fonctionner dès lors que vous obtenez un PASS au test *Check partial server configuration*).
 
 
diff --git a/docs/fr/users/07_Frequently_Asked_Questions.md b/docs/fr/users/07_Frequently_Asked_Questions.md
index 2dc2cae97..87ff8631a 100644
--- a/docs/fr/users/07_Frequently_Asked_Questions.md
+++ b/docs/fr/users/07_Frequently_Asked_Questions.md
@@ -19,9 +19,9 @@ L'explication est la même pour les fichiers ```favicon.ico``` et ```.htaccess``
 
 ## Pourquoi j'ai des erreurs quand j'essaye d'enregistrer un flux ?
 
-Il peut y avoir différentes origines à ce problème.  
+Il peut y avoir différentes origines à ce problème.
 Le flux peut avoir une syntaxe invalide, il peut ne pas être reconnu par la bibliothèque SimplePie, l'hébergement peut avoir des problèmes, FreshRSS peut être boggué.
-Il faut dans un premier temps déterminer la cause du problème.  
+Il faut dans un premier temps déterminer la cause du problème.
 Voici la liste des étapes à suivre pour la déterminer :
 
 1. __Vérifier la validité du flux__ grâce à l'[outil en ligne du W3C](http://validator.w3.org/feed/ "Validateur en ligne de flux RSS et Atom"). Si ça ne fonctionne pas, nous ne pouvons rien faire.
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 3fabb73c8..873fa21ff 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -117,7 +117,7 @@ abstract class MinzPDO extends PDO {
 	public function __construct($dsn, $username = null, $passwd = null, $options = null) {
 		parent::__construct($dsn, $username, $passwd, $options);
 		$this->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
-    }
+	}
 
 	abstract public function dbType();
 
@@ -178,7 +178,7 @@ class MinzPDOSQLite extends MinzPDO {
 	public function __construct($dsn, $username = null, $passwd = null, $options = null) {
 		parent::__construct($dsn, $username, $passwd, $options);
 		$this->exec('PRAGMA foreign_keys = ON;');
-    }
+	}
 
 	public function dbType() {
 		return 'sqlite';
@@ -193,7 +193,7 @@ class MinzPDOPGSQL extends MinzPDO {
 	public function __construct($dsn, $username = null, $passwd = null, $options = null) {
 		parent::__construct($dsn, $username, $passwd, $options);
 		$this->exec("SET NAMES 'UTF8';");
-    }
+	}
 
 	public function dbType() {
 		return 'pgsql';
-- 
cgit v1.2.3


From 85cf0ac5abe4916d9a87463877835f0b8c19ca52 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 1 Oct 2019 18:18:09 +0200
Subject: Changelog 2522 2542

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e68c9a2fe..4b80ea1ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 * Bug fixing
 	* Fix missing PHP `opcache` package in Docker Alpine [#2498](https://github.com/FreshRSS/FreshRSS/pull/2498)
 	* Fix IE11 / Edge keyboard compatibility [#2507](https://github.com/FreshRSS/FreshRSS/pull/2507)
+	* Use <dc:creator> instead of <author> for RSS 2.0 outputs [#2542](https://github.com/FreshRSS/FreshRSS/pull/2542)
 * Security
 	* Fix referrer vulnerability when opening an article original link with a shortcut [#2506](https://github.com/FreshRSS/FreshRSS/pull/2506)
 	* Slight refactoring of access check [#2471](https://github.com/FreshRSS/FreshRSS/pull/2471)
@@ -38,6 +39,7 @@
 	* Additional hooks [#2482](https://github.com/FreshRSS/FreshRSS/pull/2482)
 	* New call to change the layout [#2467](https://github.com/FreshRSS/FreshRSS/pull/2467)
 * Misc.
+	* PDO (database) refactoring for code simplification [#2522](https://github.com/FreshRSS/FreshRSS/pull/2522)
 	* Automatic check of CSS syntax in Travis CI [#2477](https://github.com/FreshRSS/FreshRSS/pull/2477)
 	* Remove support for sharing with Google+ [#2464](https://github.com/FreshRSS/FreshRSS/pull/2464)
 	* Redirect connected users accessing registration page [#2530](https://github.com/FreshRSS/FreshRSS/pull/2530)
-- 
cgit v1.2.3


From 83b0521233771c1b2da617672ea168751ed8016d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 1 Oct 2019 20:45:35 +0200
Subject: Changelog 2542 syntax

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b80ea1ae..90e8ca11c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@
 * Bug fixing
 	* Fix missing PHP `opcache` package in Docker Alpine [#2498](https://github.com/FreshRSS/FreshRSS/pull/2498)
 	* Fix IE11 / Edge keyboard compatibility [#2507](https://github.com/FreshRSS/FreshRSS/pull/2507)
-	* Use <dc:creator> instead of <author> for RSS 2.0 outputs [#2542](https://github.com/FreshRSS/FreshRSS/pull/2542)
+	* Use `<dc:creator>` instead of `<author>` for RSS 2.0 outputs [#2542](https://github.com/FreshRSS/FreshRSS/pull/2542)
 * Security
 	* Fix referrer vulnerability when opening an article original link with a shortcut [#2506](https://github.com/FreshRSS/FreshRSS/pull/2506)
 	* Slight refactoring of access check [#2471](https://github.com/FreshRSS/FreshRSS/pull/2471)
-- 
cgit v1.2.3


From ac9e2df7f8c8d49750ecf28a3afbbe0bfb6d571d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Oct 2019 22:36:45 +0200
Subject: Changelog 2448 2549 2554 2555 2559 2562

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90e8ca11c..ed596832c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@
 	* Add e-mail capability [#2476](https://github.com/FreshRSS/FreshRSS/pull/2476), [#2481](https://github.com/FreshRSS/FreshRSS/pull/2481)
 	* Ability to define default user settings in `data/config-user.custom.php` [#2490](https://github.com/FreshRSS/FreshRSS/pull/2490)
 		* Including default feeds [#2515](https://github.com/FreshRSS/FreshRSS/pull/2515)
+	* Allow recreating users if they still exist in database [#2555](https://github.com/FreshRSS/FreshRSS/pull/2555)
+	* Add optional database connection URI parameters [#2549](https://github.com/FreshRSS/FreshRSS/issues/2549), [#2559](https://github.com/FreshRSS/FreshRSS/pull/2559)
+	* Allow longer articles with MySQL / MariaDB (up to 16MB compressed instead of 64kB) [#2448](https://github.com/FreshRSS/FreshRSS/issues/2448)
 	* Add support for terms of service [#2520](https://github.com/FreshRSS/FreshRSS/pull/2520)
 	* Add sharing with [Lemmy](https://github.com/dessalines/lemmy) [#2510](https://github.com/FreshRSS/FreshRSS/pull/2510)
 * API
@@ -16,15 +19,17 @@
 * Compatibility
 	* Require at least PHP 5.6+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495), [#2527](https://github.com/FreshRSS/FreshRSS/pull/2527)
 	* Require `php-json` and remove remove `JSON.php` fallback [#2528](https://github.com/FreshRSS/FreshRSS/pull/2528)
+	* Require at least PostgreSQL 9.5+ [#2554](https://github.com/FreshRSS/FreshRSS/pull/2554)
 * Deployment
 	* Take advantage of `mod_authz_core` instead of `mod_access_compat` when running on Apache 2.4+ [#2461](https://github.com/FreshRSS/FreshRSS/pull/2461)
-	* Docker: Alpine image updated to 3.10 with PHP 7.3.8 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+	* Docker: Alpine image updated to 3.10 with PHP 7.3.10 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
 	* Git ignore `themes/xTheme-*` [#2511](https://github.com/FreshRSS/FreshRSS/pull/2511)
 	* New environment variable `FRESHRSS_ENV` to control Minz development mode [#2508](https://github.com/FreshRSS/FreshRSS/pull/2508)
 * Bug fixing
 	* Fix missing PHP `opcache` package in Docker Alpine [#2498](https://github.com/FreshRSS/FreshRSS/pull/2498)
 	* Fix IE11 / Edge keyboard compatibility [#2507](https://github.com/FreshRSS/FreshRSS/pull/2507)
 	* Use `<dc:creator>` instead of `<author>` for RSS 2.0 outputs [#2542](https://github.com/FreshRSS/FreshRSS/pull/2542)
+	* Fix PostgreSQL and SQLite database size estimation [#2562](https://github.com/FreshRSS/FreshRSS/pull/2562)
 * Security
 	* Fix referrer vulnerability when opening an article original link with a shortcut [#2506](https://github.com/FreshRSS/FreshRSS/pull/2506)
 	* Slight refactoring of access check [#2471](https://github.com/FreshRSS/FreshRSS/pull/2471)
-- 
cgit v1.2.3


From 4da0dc4f252dcc8d56cbf3a8ffb9c0fb7ddf3e4e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 24 Oct 2019 12:08:07 +0200
Subject: Changelog 2335 etc.

---
 CHANGELOG.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed596832c..5d16b5bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * CLI
 	* Command line to export/import any database to/from SQLite [#2496](https://github.com/FreshRSS/FreshRSS/pull/2496)
 * Features
+	* New archiving method, including maximum number of articles per feed, and settings at feed, category, global levels [#2335](https://github.com/FreshRSS/FreshRSS/pull/2335)
 	* New option to display article authors underneath the article title [#2487](https://github.com/FreshRSS/FreshRSS/pull/2487)
 	* Add e-mail capability [#2476](https://github.com/FreshRSS/FreshRSS/pull/2476), [#2481](https://github.com/FreshRSS/FreshRSS/pull/2481)
 	* Ability to define default user settings in `data/config-user.custom.php` [#2490](https://github.com/FreshRSS/FreshRSS/pull/2490)
@@ -17,12 +18,14 @@
 * API
 	* Add support for [Reeder-4](https://www.reederapp.com/) client [#2513](https://github.com/FreshRSS/FreshRSS/issues/2513)
 * Compatibility
-	* Require at least PHP 5.6+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495), [#2527](https://github.com/FreshRSS/FreshRSS/pull/2527)
+	* Require at least PHP 5.6+ [#2495](https://github.com/FreshRSS/FreshRSS/pull/2495), [#2527](https://github.com/FreshRSS/FreshRSS/pull/2527), [#2585](https://github.com/FreshRSS/FreshRSS/pull/2585)
 	* Require `php-json` and remove remove `JSON.php` fallback [#2528](https://github.com/FreshRSS/FreshRSS/pull/2528)
 	* Require at least PostgreSQL 9.5+ [#2554](https://github.com/FreshRSS/FreshRSS/pull/2554)
 * Deployment
 	* Take advantage of `mod_authz_core` instead of `mod_access_compat` when running on Apache 2.4+ [#2461](https://github.com/FreshRSS/FreshRSS/pull/2461)
+	* Docker: Ubuntu image updated to 19.10 with PHP 7.3.8 and Apache 2.4.41 [#2577](https://github.com/FreshRSS/FreshRSS/pull/2577)
 	* Docker: Alpine image updated to 3.10 with PHP 7.3.10 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+	* Docker: Increase default PHP POST/upload size to ease importing ZIP files [#2563](https://github.com/FreshRSS/FreshRSS/pull/2563)
 	* Git ignore `themes/xTheme-*` [#2511](https://github.com/FreshRSS/FreshRSS/pull/2511)
 	* New environment variable `FRESHRSS_ENV` to control Minz development mode [#2508](https://github.com/FreshRSS/FreshRSS/pull/2508)
 * Bug fixing
@@ -30,6 +33,7 @@
 	* Fix IE11 / Edge keyboard compatibility [#2507](https://github.com/FreshRSS/FreshRSS/pull/2507)
 	* Use `<dc:creator>` instead of `<author>` for RSS 2.0 outputs [#2542](https://github.com/FreshRSS/FreshRSS/pull/2542)
 	* Fix PostgreSQL and SQLite database size estimation [#2562](https://github.com/FreshRSS/FreshRSS/pull/2562)
+	* Fix broken SVG icons in Swage theme [#2568](https://github.com/FreshRSS/FreshRSS/issues/2568), [#2571](https://github.com/FreshRSS/FreshRSS/pull/2571)
 * Security
 	* Fix referrer vulnerability when opening an article original link with a shortcut [#2506](https://github.com/FreshRSS/FreshRSS/pull/2506)
 	* Slight refactoring of access check [#2471](https://github.com/FreshRSS/FreshRSS/pull/2471)
@@ -39,13 +43,15 @@
 * I18n
 	* Add Slovak [#2497](https://github.com/FreshRSS/FreshRSS/pull/2497)
 	* Improve Dutch [#2503](https://github.com/FreshRSS/FreshRSS/pull/2503)
-	* Improve Occitan [#2519](https://github.com/FreshRSS/FreshRSS/pull/2519)
+	* Improve Occitan [#2519](https://github.com/FreshRSS/FreshRSS/pull/2519), [#2583](https://github.com/FreshRSS/FreshRSS/pull/2583)
 * Extensions
 	* Additional hooks [#2482](https://github.com/FreshRSS/FreshRSS/pull/2482)
 	* New call to change the layout [#2467](https://github.com/FreshRSS/FreshRSS/pull/2467)
 * Misc.
+	* Make our JavaScript compatible with LibreJS [#2576](https://github.com/FreshRSS/FreshRSS/pull/2576)
 	* PDO (database) refactoring for code simplification [#2522](https://github.com/FreshRSS/FreshRSS/pull/2522)
 	* Automatic check of CSS syntax in Travis CI [#2477](https://github.com/FreshRSS/FreshRSS/pull/2477)
+	* Make our Travis greener by reducing redundant tests [#2589](https://github.com/FreshRSS/FreshRSS/pull/2589)
 	* Remove support for sharing with Google+ [#2464](https://github.com/FreshRSS/FreshRSS/pull/2464)
 	* Redirect connected users accessing registration page [#2530](https://github.com/FreshRSS/FreshRSS/pull/2530)
 	* Add Makefile [#2481](https://github.com/FreshRSS/FreshRSS/pull/2481)
-- 
cgit v1.2.3


From 97190cf7e486977a2624a81a55bf7d078256fcd5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 26 Oct 2019 13:22:21 +0200
Subject: Changelog 2591 2592

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d16b5bcb..d45691f75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 	* Command line to export/import any database to/from SQLite [#2496](https://github.com/FreshRSS/FreshRSS/pull/2496)
 * Features
 	* New archiving method, including maximum number of articles per feed, and settings at feed, category, global levels [#2335](https://github.com/FreshRSS/FreshRSS/pull/2335)
+	* New option to control category sort order [#2592](https://github.com/FreshRSS/FreshRSS/pull/2592)
 	* New option to display article authors underneath the article title [#2487](https://github.com/FreshRSS/FreshRSS/pull/2487)
 	* Add e-mail capability [#2476](https://github.com/FreshRSS/FreshRSS/pull/2476), [#2481](https://github.com/FreshRSS/FreshRSS/pull/2481)
 	* Ability to define default user settings in `data/config-user.custom.php` [#2490](https://github.com/FreshRSS/FreshRSS/pull/2490)
@@ -26,8 +27,9 @@
 	* Docker: Ubuntu image updated to 19.10 with PHP 7.3.8 and Apache 2.4.41 [#2577](https://github.com/FreshRSS/FreshRSS/pull/2577)
 	* Docker: Alpine image updated to 3.10 with PHP 7.3.10 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
 	* Docker: Increase default PHP POST/upload size to ease importing ZIP files [#2563](https://github.com/FreshRSS/FreshRSS/pull/2563)
-	* Git ignore `themes/xTheme-*` [#2511](https://github.com/FreshRSS/FreshRSS/pull/2511)
+	* New environment variable `COPY_LOG_TO_SYSLOG` to see all logs at once in e.g. `docker logs -f` [#2591](https://github.com/FreshRSS/FreshRSS/pull/2591)
 	* New environment variable `FRESHRSS_ENV` to control Minz development mode [#2508](https://github.com/FreshRSS/FreshRSS/pull/2508)
+	* Git ignore `themes/xTheme-*` [#2511](https://github.com/FreshRSS/FreshRSS/pull/2511)
 * Bug fixing
 	* Fix missing PHP `opcache` package in Docker Alpine [#2498](https://github.com/FreshRSS/FreshRSS/pull/2498)
 	* Fix IE11 / Edge keyboard compatibility [#2507](https://github.com/FreshRSS/FreshRSS/pull/2507)
-- 
cgit v1.2.3


From a0d0fe81b129c46276baadc99c1666b9a04b19f9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 27 Oct 2019 20:52:13 +0100
Subject: More credits

---
 CHANGELOG.md | 4 ++--
 CREDITS.md   | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d45691f75..8ec5581fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@
 * Deployment
 	* Take advantage of `mod_authz_core` instead of `mod_access_compat` when running on Apache 2.4+ [#2461](https://github.com/FreshRSS/FreshRSS/pull/2461)
 	* Docker: Ubuntu image updated to 19.10 with PHP 7.3.8 and Apache 2.4.41 [#2577](https://github.com/FreshRSS/FreshRSS/pull/2577)
-	* Docker: Alpine image updated to 3.10 with PHP 7.3.10 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+	* Docker: Alpine image updated to 3.10 with PHP 7.3.11 and Apache 2.4.41 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
 	* Docker: Increase default PHP POST/upload size to ease importing ZIP files [#2563](https://github.com/FreshRSS/FreshRSS/pull/2563)
 	* New environment variable `COPY_LOG_TO_SYSLOG` to see all logs at once in e.g. `docker logs -f` [#2591](https://github.com/FreshRSS/FreshRSS/pull/2591)
 	* New environment variable `FRESHRSS_ENV` to control Minz development mode [#2508](https://github.com/FreshRSS/FreshRSS/pull/2508)
@@ -45,7 +45,7 @@
 * I18n
 	* Add Slovak [#2497](https://github.com/FreshRSS/FreshRSS/pull/2497)
 	* Improve Dutch [#2503](https://github.com/FreshRSS/FreshRSS/pull/2503)
-	* Improve Occitan [#2519](https://github.com/FreshRSS/FreshRSS/pull/2519), [#2583](https://github.com/FreshRSS/FreshRSS/pull/2583)
+	* Improve Occitan [#2519](https://github.com/FreshRSS/FreshRSS/pull/2519), [#2583](https://github.com/FreshRSS/FreshRSS/pull/2583), [#2603](https://github.com/FreshRSS/FreshRSS/pull/2603)
 * Extensions
 	* Additional hooks [#2482](https://github.com/FreshRSS/FreshRSS/pull/2482)
 	* New call to change the layout [#2467](https://github.com/FreshRSS/FreshRSS/pull/2467)
diff --git a/CREDITS.md b/CREDITS.md
index d220ad57c..d52d3c72c 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -13,6 +13,7 @@ People are sorted by name so please keep this order.
 * [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin)
 * [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade), [Web](https://amaury.carrade.eu/)
 * [Anton Smirnov](https://github.com/sandfoxme): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:sandfoxme), [Web](http://sandfox.me/)
+* [ArthurHoaro](https://github.com/ArthurHoaro): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:ArthurHoaro), [Web](http://sandfox.me/)
 * [ASMfreaK](https://github.com/ASMfreaK): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ASMfreaK)
 * [Benjamin Bouvier](https://github.com/bnjbvr): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:bnjbvr), [Web](https://benj.me/)
 * [chemical1979](https://github.com/chemical1979): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=chemical1979)
@@ -26,6 +27,7 @@ People are sorted by name so please keep this order.
 * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
 * [Fake4d](https://github.com/Fake4d): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Fake4d)
 * [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Frenzie), [Web](http://fransdejonge.com/)
+* [Gaurav Thakur](https://github.com/notfoss): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:notfoss), [Web](https://blog.notfoss.com/)
 * [Gregor Nathanael Meyer](https://github.com/spackmat): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:spackmat), [Web](https://der-meyer.de)
 * [gsongsong](https://github.com/gsongsong): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:gsongsong)
 * [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:kokaz), [Web](http://www.guillaume-fillon.com/)
@@ -36,6 +38,7 @@ People are sorted by name so please keep this order.
 * [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/)
 * [jlefler](https://github.com/jlefler): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jlefler)
 * [Jonas Östanbäck](https://github.com/cez81): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=cez81)
+* [Joris Kinable](https://github.com/jkinable): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jkinable)
 * [Julien Reichardt](https://github.com/j8r): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=j8r), [Web](https://blog.jrei.ch/)
 * [Kevin Papst](https://github.com/kevinpapst): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=kevinpapst), [Web](http://www.kevinpapst.de/)
 * [Leepic](https://github.com/Leepic): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Leepic)
@@ -58,13 +61,14 @@ People are sorted by name so please keep this order.
 * [Paulius Šukys](https://github.com/psukys): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:psukys), [Web](http://sukys.eu)
 * [perrinjerome](https://github.com/perrinjerome): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:perrinjerome)
 * [Peter Stoinov](https://github.com/stoinov): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:stoinov), [Web](https://stoinov.com)
-* [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
 * [Pim Snel](https://github.com/mipmip): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is%3Apr+author%3Amipmip), [Web](https://www.pimsnel.com)
+* [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
 * [primaeval](https://github.com/primaeval): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:primaeval)
 * [purexo](https://github.com/purexo): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:purexo), [Web](https://purexo.mom/)
 * [Quentin Dufour](https://github.com/superboum): [contributions](https://github.com/FreshRSS/documentation/commits?author=superboum), [Web](http://quentin.dufour.io/)
 * [Quentin Pagès](https://github.com/Quenty31): [contributions](https://github.com/FreshRSS/documentation/commits?author=Quenty31)
 * [Ramón Cutanda](https://github.com/rcutanda): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rcutanda)
+* [Robert Kaussow](https://github.com/xoxys): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:xoxys), [Web](https://geeklabor.de/)
 * [rocka](https://github.com/rocka): [contributions](https://github.com/FreshRSS/FreshRss/commits/dev?author=rocka)
 * [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=romibi)
 * [Rosemary Le Faive](https://github.com/rosiel): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rosiel)
@@ -81,3 +85,5 @@ People are sorted by name so please keep this order.
 * [Twilek-de](https://github.com/Twilek-de): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Twilek-de)
 * [Uncovery](https://github.com/uncovery): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:uncovery)
 * [Wanabo](https://github.com/Wanabo): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Wanabo)
+* [wtoscer](https://github.com/wtoscer): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:wtoscer)
+* [Yamakuni](https://github.com/Yamakuni): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Yamakuni), [Web](https://ofanch.me/)
-- 
cgit v1.2.3


From fcae48f313d399050cb15f37a8a73ae52fc67796 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 31 Oct 2019 17:02:34 +0100
Subject: Release version 1.15

---
 CHANGELOG.md  | 2 +-
 constants.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ec5581fd..1070566dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # FreshRSS changelog
 
-## 2019-1X-XX FreshRSS 1.14.4-dev
+## 2019-10-31 FreshRSS 1.15.0
 
 * CLI
 	* Command line to export/import any database to/from SQLite [#2496](https://github.com/FreshRSS/FreshRSS/pull/2496)
diff --git a/constants.php b/constants.php
index 2ccf91358..1228e5c29 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.4-dev');
+define('FRESHRSS_VERSION', '1.15.0');
 define('FRESHRSS_WEBSITE', 'https://freshrss.org');
 define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/');
 
-- 
cgit v1.2.3