From 50fd3a359e1fb872859b12af2762e47a696ebcd3 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 1 Apr 2017 11:24:59 +0200 Subject: Fix PostgreSQL uniqueness And remove "experimental" warning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index d599afaa4..43faf1a73 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ We are a friendly community. * PHP 5.3.3+ (PHP 5.4+ recommended, and PHP 5.5+ for performance, and PHP 7 for even higher performance) * Required extensions: [cURL](http://php.net/curl), [DOM](http://php.net/dom), [XML](http://php.net/xml), and [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite) or [PDO_PGSQL](http://php.net/pdo-pgsql) * Recommended extensions: [JSON](http://php.net/json), [GMP](http://php.net/gmp) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names), [mbstring](http://php.net/mbstring) and/or [iconv](http://php.net/iconv) (for charset conversion), [ZIP](http://php.net/zip) (for import/export), [zlib](http://php.net/zlib) (for compressed feeds) -* MySQL 5.5.3+ (recommended), or SQLite 3.7.4+, or PostgreSQL (experimental) +* MySQL 5.5.3+ (recommended), or SQLite 3.7.4+, or PostgreSQL 9.2+ * A recent browser like Firefox, Internet Explorer 11 / Edge, Chrome, Opera, Safari. * Works on mobile -- cgit v1.2.3 From 4699361f6b6ee3a671295d18877f47a8c4b1ae8e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 1 Apr 2017 18:55:40 +0200 Subject: Readme log location https://github.com/FreshRSS/FreshRSS/issues/1475 --- README.fr.md | 3 ++- README.md | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'README.md') diff --git a/README.fr.md b/README.fr.md index da402c92e..147480e08 100644 --- a/README.fr.md +++ b/README.fr.md @@ -130,7 +130,8 @@ Créer `/etc/cron.d/FreshRSS` avec : * Pour une meilleure sécurité, faites en sorte que seul le répertoire `./p/` soit accessible depuis le Web, par exemple en faisant pointer un sous-domaine sur le répertoire `./p/`. * En particulier, les données personnelles se trouvent dans le répertoire `./data/`. * Le fichier `./constants.php` définit les chemins d’accès aux répertoires clés de l’application. Si vous les bougez, tout se passe ici. -* En cas de problème, les logs peuvent être utile à lire, soit depuis l’interface de FreshRSS, soit manuellement depuis `./data/log/*.log`. +* En cas de problème, les logs peuvent être utile à lire, soit depuis l’interface de FreshRSS, soit manuellement depuis `./data/users/*/log*.txt`. + * Le répertoire spécial `./data/users/_/` contient la partie des logs partagés par tous les utilisateurs. # Sauvegarde diff --git a/README.md b/README.md index 43faf1a73..3c0c9f8ee 100644 --- a/README.md +++ b/README.md @@ -128,10 +128,11 @@ Create `/etc/cron.d/FreshRSS` with: # Advices -* For a better security, expose only the `./p/` folder on the web. +* For a better security, expose only the `./p/` folder on the Web. * Be aware that the `./data/` folder contains all personal data, so it is a bad idea to expose it. * The `./constants.php` file defines access to application folder. If you want to customize your installation, every thing happens here. -* If you encounter any problem, logs are accessible from the interface or manually in `./data/log/*.log` files. +* If you encounter any problem, logs are accessible from the interface or manually in `./data/users/*/log*.txt` files. + * The special folder `./data/users/_/` contains the part of the logs that are shared by all users. # Backup -- cgit v1.2.3 From 730649971cc9a8b2e0b4565014730f992130fcec Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 5 Apr 2017 00:43:08 +0200 Subject: Links to documentation * http://doc.freshrss.org/ * https://github.com/FreshRSS/documentation --- README.fr.md | 4 ++++ README.md | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'README.md') diff --git a/README.fr.md b/README.fr.md index 147480e08..de76919e6 100644 --- a/README.fr.md +++ b/README.fr.md @@ -41,6 +41,10 @@ Nous sommes une communauté amicale. ![Capture d’écran de FreshRSS](./doc/FreshRSS-screenshot.png) +# Documentation +* http://doc.freshrss.org/fr/ +* https://github.com/FreshRSS/documentation + # Installation 1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](../releases) 2. Placez l’application sur votre serveur (la partie à exposer au Web est le répertoire `./p/`) diff --git a/README.md b/README.md index 3c0c9f8ee..94b8ee045 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,10 @@ We are a friendly community. ![FreshRSS screenshot](./doc/FreshRSS-screenshot.png) +# Documentation +* http://doc.freshrss.org/en/ +* https://github.com/FreshRSS/documentation + # Installation 1. Get FreshRSS with git or [by downloading the archive](https://github.com/FreshRSS/FreshRSS/archive/master.zip) 2. Dump the application on your server (expose only the `./p/` folder) -- cgit v1.2.3 From ed99245810fce469b30c946e7fc405887c2a5b61 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 23 Apr 2017 18:23:37 +0200 Subject: Minor favicon text https://github.com/FreshRSS/FreshRSS/pull/1505 https://github.com/FreshRSS/FreshRSS/pull/1504 --- README.fr.md | 1 - README.md | 1 - lib/favicons.php | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'README.md') diff --git a/README.fr.md b/README.fr.md index de76919e6..25895d48c 100644 --- a/README.fr.md +++ b/README.fr.md @@ -159,7 +159,6 @@ Voir le [dépôt dédié à ces extensions](https://github.com/FreshRSS/Extensio * [MINZ](https://github.com/marienfressinaud/MINZ) * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/) * [jQuery](http://jquery.com/) -* [ArthurHoaro/favicon](https://github.com/ArthurHoaro/favicon) * [lib_opml](https://github.com/marienfressinaud/lib_opml) * [jQuery Plugin Sticky-Kit](http://leafo.net/sticky-kit/) * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/) diff --git a/README.md b/README.md index 94b8ee045..ef04c8cc0 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,6 @@ See the [repository dedicated to those extensions](https://github.com/FreshRSS/E * [MINZ](https://github.com/marienfressinaud/MINZ) * [php-http-304](http://alexandre.alapetite.fr/doc-alex/php-http-304/) * [jQuery](http://jquery.com/) -* [ArthurHoaro/favicon](https://github.com/ArthurHoaro/favicon) * [lib_opml](https://github.com/marienfressinaud/lib_opml) * [jQuery Plugin Sticky-Kit](http://leafo.net/sticky-kit/) * [keyboard_shortcuts](http://www.openjs.com/scripts/events/keyboard_shortcuts/) diff --git a/lib/favicons.php b/lib/favicons.php index 62a21a246..48f7c9fda 100644 --- a/lib/favicons.php +++ b/lib/favicons.php @@ -4,7 +4,7 @@ $default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.ico'; function isImgMime($content) { //Based on https://github.com/ArthurHoaro/favicon/blob/3a4f93da9bb24915b21771eb7873a21bde26f5d1/src/Favicon/Favicon.php#L311-L319 - if($content == '') { + if ($content == '') { return false; } if (!extension_loaded('fileinfo')) { -- cgit v1.2.3