From 001a7bad66fd1ce2b208abfe89177e72b5e1baa5 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 3 Sep 2016 09:24:34 +0200 Subject: [PATCH 1/7] Add a check for the database connection Checking for the driver isn't enough. We are now checking if we can etablish a connection to the database before trying to do anything. By displaying the error from the Exception (in case of error) we hope to reduce issues overload about people getting error with the database --- .../CoreBundle/Command/InstallCommand.php | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 813ac720d..50d0dfff4 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -72,8 +72,10 @@ class InstallCommand extends ContainerAwareCommand { $this->defaultOutput->writeln('Step 1 of 5. Checking system requirements.'); - $fulfilled = true; + $rows = []; + // testing if database driver exists + $fulfilled = true; $label = 'PDO Driver'; $status = 'OK!'; $help = ''; @@ -84,7 +86,21 @@ class InstallCommand extends ContainerAwareCommand $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.'; } - $rows = []; + $rows[] = [$label, $status, $help]; + + // testing if connection to the database can be etablished + $label = 'Database connection'; + $status = 'OK!'; + $help = ''; + + try { + $this->getContainer()->get('doctrine')->getManager()->getConnection()->connect(); + } catch (\Exception $e) { + $fulfilled = false; + $status = 'ERROR!'; + $help = 'Can\'t connect to the database: '.$e->getMessage(); + } + $rows[] = [$label, $status, $help]; foreach ($this->functionExists as $functionRequired) { From f62c3faf88fbc1c2a484854019d17ff377836717 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 3 Sep 2016 10:34:27 +0200 Subject: [PATCH 2/7] Update test If the database isn't found when checking for the connection it means, we can connect to the server. The InstallCommand will create the database later. Also, when checking for the SQLite connection, Doctrine creates the file (so the database). That's why the test is skipped for SQLite. --- src/Wallabag/CoreBundle/Command/InstallCommand.php | 10 ++++++---- .../Wallabag/CoreBundle/Command/InstallCommandTest.php | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 50d0dfff4..cd8161490 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -96,9 +96,11 @@ class InstallCommand extends ContainerAwareCommand try { $this->getContainer()->get('doctrine')->getManager()->getConnection()->connect(); } catch (\Exception $e) { - $fulfilled = false; - $status = 'ERROR!'; - $help = 'Can\'t connect to the database: '.$e->getMessage(); + if (false === strpos($e->getMessage(), "Unknown database")) { + $fulfilled = false; + $status = 'ERROR!'; + $help = 'Can\'t connect to the database: '.$e->getMessage(); + } } $rows[] = [$label, $status, $help]; @@ -472,7 +474,7 @@ class InstallCommand extends ContainerAwareCommand } // custom verification for sqlite, since `getListDatabasesSQL` doesn't work for sqlite - if ('sqlite' == $schemaManager->getDatabasePlatform()->getName()) { + if ('sqlite' === $schemaManager->getDatabasePlatform()->getName()) { $params = $this->getContainer()->get('doctrine.dbal.default_connection')->getParams(); if (isset($params['path']) && file_exists($params['path'])) { diff --git a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php index 089a1c5fe..83f5bf246 100644 --- a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php +++ b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php @@ -127,6 +127,12 @@ class InstallCommandTest extends WallabagCoreTestCase public function testRunInstallCommandWithDatabaseRemoved() { + // skipped SQLite check when database is removed because while testing for the connection, + // the driver will create the file (so the database) before testing if database exist + if ($this->getClient()->getContainer()->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) { + $this->markTestSkipped('SQLite spotted: can\'t test with database removed.'); + } + $application = new Application($this->getClient()->getKernel()); $application->add(new DropDatabaseDoctrineCommand()); From 5070644a12ad264444a812b783a04386d6581cb0 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 3 Sep 2016 11:45:59 +0200 Subject: [PATCH 3/7] CS --- src/Wallabag/CoreBundle/Command/InstallCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index cd8161490..035eb8655 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -96,7 +96,7 @@ class InstallCommand extends ContainerAwareCommand try { $this->getContainer()->get('doctrine')->getManager()->getConnection()->connect(); } catch (\Exception $e) { - if (false === strpos($e->getMessage(), "Unknown database")) { + if (false === strpos($e->getMessage(), 'Unknown database')) { $fulfilled = false; $status = 'ERROR!'; $help = 'Can\'t connect to the database: '.$e->getMessage(); From 94d1dae4ef9ee9698068b63b8f20a89519f98939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 6 Sep 2016 13:43:53 +0200 Subject: [PATCH 4/7] Update install documentation --- docs/de/user/installation.rst | 2 ++ docs/de/user/upgrade.rst | 6 ++++-- docs/en/user/installation.rst | 2 ++ docs/en/user/upgrade.rst | 10 ++++++---- docs/fr/user/installation.rst | 2 ++ docs/fr/user/upgrade.rst | 8 +++++--- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index 1b6710b7c..8f121087b 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -86,6 +86,8 @@ Führe dieses Kommando aus, um das neueste Paket herunterzuladen und zu entpacke wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package +(md5 hash: ``18aadd1003a08eb11f5341b9755029f8``) + Jetzt lese die Dokumentation, um einen Virtualhost zu erstellen, dann greife auf dein wallabag zu. Wenn du die Datenbankkonfiguration eingestellt hast, MySQL oder PostgreSQL zu nutzen, musst du einen Nutzer über das folgende Kommando erstellen ``php bin/console wallabag:install --env=prod``. diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst index 13e3104f3..ac35f4a8b 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade.rst @@ -4,13 +4,13 @@ Wallabag updaten Update auf einem dedizierten Webserver -------------------------------------- -Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.0.3`` mit der neuesten Releasenummer): +Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.0.7`` mit der neuesten Releasenummer): :: git fetch origin git fetch --tags - git checkout 2.0.3 + git checkout 2.0.7 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod @@ -25,6 +25,8 @@ Lade das neueste Release von wallabag herunter: wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package +(md5 hash: ``18aadd1003a08eb11f5341b9755029f8``) + Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren. diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 95df263ab..a5b373271 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -85,6 +85,8 @@ Execute this command to download and extract the latest package: wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package +(md5 hash of the package: ``18aadd1003a08eb11f5341b9755029f8``) + Now, read the following documentation to create your virtual host, then access your wallabag. If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``. diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst index 7782dc8a5..141b15116 100644 --- a/docs/en/user/upgrade.rst +++ b/docs/en/user/upgrade.rst @@ -4,27 +4,29 @@ Upgrade wallabag Upgrade on a dedicated web server --------------------------------- -The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.3`` by the last release number): +The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.7`` by the last release number): :: git fetch origin git fetch --tags - git checkout 2.0.3 + git checkout 2.0.7 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod -Upgrade on a shared hosting +Upgrade on a shared hosting --------------------------- Backup your ``app/config/parameters.yml`` file. -Download the last release of wallabag: +Download the last release of wallabag: .. code-block:: bash wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package +(md5 hash of the package: ``18aadd1003a08eb11f5341b9755029f8``) + Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. If you use SQLite, you must also copy your ``data/`` folder inside the new installation. diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index d46f79a40..f63f2b0af 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -82,6 +82,8 @@ Exécutez cette commande pour télécharger et décompresser l'archive : wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package +(hash md5 de l'archive : ``18aadd1003a08eb11f5341b9755029f8``) + Maintenant, lisez la documentation ci-dessous pour crééer un virtual host. Accédez ensuite à votre installation de wallabag. Si vous avez changé la configuration pour modifier le type de stockage (MySQL ou PostgreSQL), vous devrez vous créer un utilisateur via la commande ``php bin/console wallabag:install --env=prod``. diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst index 84a1692dd..c8689745e 100644 --- a/docs/fr/user/upgrade.rst +++ b/docs/fr/user/upgrade.rst @@ -4,13 +4,13 @@ Mettre à jour wallabag Mise à jour sur un serveur dédié -------------------------------- -La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.3`` par le numéro de la dernière version) : +La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.7`` par le numéro de la dernière version) : :: git fetch origin git fetch --tags - git checkout 2.0.3 + git checkout 2.0.7 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod @@ -19,12 +19,14 @@ Mise à jour sur un hébergement mutualisé Effectuez une sauvegarde du fichier ``app/config/parameters.yml``. -Téléchargez la dernière version de wallabag : +Téléchargez la dernière version de wallabag : .. code-block:: bash wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package +(hash md5 de l'archive : ``18aadd1003a08eb11f5341b9755029f8``) + Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``. From 5bdec0195f2b8cb631889479507390567f148b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 7 Sep 2016 14:27:32 +0200 Subject: [PATCH 5/7] Prepare wallabag 2.0.8 --- CHANGELOG.md | 18 ++++++++++++++++++ README.md | 2 +- app/config/config.yml | 2 +- docs/de/user/installation.rst | 2 +- docs/de/user/upgrade.rst | 4 ++-- docs/en/user/installation.rst | 2 +- docs/en/user/upgrade.rst | 4 ++-- docs/fr/user/installation.rst | 2 +- docs/fr/user/upgrade.rst | 4 ++-- 9 files changed, 29 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6f7e168d..3f2c2655e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [2.0.8] - 2016-09-07 + +### Added + +- [#2262](https://github.com/wallabag/wallabag/pull/2262) Added a check for the database connection during installation (Jeremy Benoist) +- [#2235](https://github.com/wallabag/wallabag/pull/2235) Added configuration for german documentation website, [available here](http://doc.wallabag.org/de/latest/) (Nicolas Lœuillet) + +### Changed + +- [graby](https://github.com/j0k3r/graby/releases/tag/1.4.3) Update Graby version, which now handles ZIP files (Jeremy Benoist) +- [#2230](https://github.com/wallabag/wallabag/pull/2230) Changed title display in card view (Danilow Alexandr) + +### Fixed + +- [#2234](https://github.com/wallabag/wallabag/pull/2234) Fixed mailto link in documentation (Christian Studer) +- [#2241](https://github.com/wallabag/wallabag/pull/2241) Fixed the height of the "Add new article" field in Chrome (Danilow Alexandr) +- [#2238](https://github.com/wallabag/wallabag/pull/2238) Fixed login page in Qupzilla (Danilow Alexandr) + ## [2.0.7] - 2016-08-22 ### Added diff --git a/README.md b/README.md index 6053e6d9e..2ce6479ef 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Then you can install wallabag by executing the following commands: ``` git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.7 + git checkout 2.0.8 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod php bin/console server:run --env=prod diff --git a/app/config/config.yml b/app/config/config.yml index 49b325a29..2b11937c7 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.0.7 + version: 2.0.8 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index 8f121087b..3c0fc7289 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -54,7 +54,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen: git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.7 + git checkout 2.0.8 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst index ac35f4a8b..55bd70087 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade.rst @@ -4,13 +4,13 @@ Wallabag updaten Update auf einem dedizierten Webserver -------------------------------------- -Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.0.7`` mit der neuesten Releasenummer): +Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.0.8`` mit der neuesten Releasenummer): :: git fetch origin git fetch --tags - git checkout 2.0.7 + git checkout 2.0.8 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index a5b373271..f81ef7975 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -53,7 +53,7 @@ To install wallabag itself, you must run the following commands: git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.7 + git checkout 2.0.8 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst index 141b15116..c9047a21d 100644 --- a/docs/en/user/upgrade.rst +++ b/docs/en/user/upgrade.rst @@ -4,13 +4,13 @@ Upgrade wallabag Upgrade on a dedicated web server --------------------------------- -The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.7`` by the last release number): +The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.8`` by the last release number): :: git fetch origin git fetch --tags - git checkout 2.0.7 + git checkout 2.0.8 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index f63f2b0af..56372e7c8 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -51,7 +51,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes : git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.0.7 + git checkout 2.0.8 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst index c8689745e..94c513d06 100644 --- a/docs/fr/user/upgrade.rst +++ b/docs/fr/user/upgrade.rst @@ -4,13 +4,13 @@ Mettre à jour wallabag Mise à jour sur un serveur dédié -------------------------------- -La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.7`` par le numéro de la dernière version) : +La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.8`` par le numéro de la dernière version) : :: git fetch origin git fetch --tags - git checkout 2.0.7 + git checkout 2.0.8 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod From a707643ef1a0d5f1cf4ab9826492f4c9cb2d8c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 7 Sep 2016 15:40:15 +0200 Subject: [PATCH 6/7] Update md5 checksum for 2.0.8 in documentation --- docs/de/user/installation.rst | 2 +- docs/de/user/upgrade.rst | 2 +- docs/en/user/installation.rst | 2 +- docs/en/user/upgrade.rst | 2 +- docs/fr/user/installation.rst | 2 +- docs/fr/user/upgrade.rst | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index 3c0fc7289..fced2ed4a 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -86,7 +86,7 @@ Führe dieses Kommando aus, um das neueste Paket herunterzuladen und zu entpacke wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(md5 hash: ``18aadd1003a08eb11f5341b9755029f8``) +(md5 hash: ``4f84c725d1d6e3345eae0a406115e5ff``) Jetzt lese die Dokumentation, um einen Virtualhost zu erstellen, dann greife auf dein wallabag zu. Wenn du die Datenbankkonfiguration eingestellt hast, MySQL oder PostgreSQL zu nutzen, musst du einen Nutzer über das folgende Kommando erstellen ``php bin/console wallabag:install --env=prod``. diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst index 55bd70087..c04b68f34 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade.rst @@ -25,7 +25,7 @@ Lade das neueste Release von wallabag herunter: wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(md5 hash: ``18aadd1003a08eb11f5341b9755029f8``) +(md5 hash: ``4f84c725d1d6e3345eae0a406115e5ff``) Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index f81ef7975..763d7c66d 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -85,7 +85,7 @@ Execute this command to download and extract the latest package: wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(md5 hash of the package: ``18aadd1003a08eb11f5341b9755029f8``) +(md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``) Now, read the following documentation to create your virtual host, then access your wallabag. If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``. diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst index c9047a21d..90ed6c701 100644 --- a/docs/en/user/upgrade.rst +++ b/docs/en/user/upgrade.rst @@ -25,7 +25,7 @@ Download the last release of wallabag: wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(md5 hash of the package: ``18aadd1003a08eb11f5341b9755029f8``) +(md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``) Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 56372e7c8..480970c53 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -82,7 +82,7 @@ Exécutez cette commande pour télécharger et décompresser l'archive : wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(hash md5 de l'archive : ``18aadd1003a08eb11f5341b9755029f8``) +(hash md5 de l'archive : ``4f84c725d1d6e3345eae0a406115e5ff``) Maintenant, lisez la documentation ci-dessous pour crééer un virtual host. Accédez ensuite à votre installation de wallabag. Si vous avez changé la configuration pour modifier le type de stockage (MySQL ou PostgreSQL), vous devrez vous créer un utilisateur via la commande ``php bin/console wallabag:install --env=prod``. diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst index 94c513d06..1ead2c946 100644 --- a/docs/fr/user/upgrade.rst +++ b/docs/fr/user/upgrade.rst @@ -25,7 +25,7 @@ Téléchargez la dernière version de wallabag : wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(hash md5 de l'archive : ``18aadd1003a08eb11f5341b9755029f8``) +(hash md5 de l'archive : ``4f84c725d1d6e3345eae0a406115e5ff``) Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. From 45d94a98f78320fd993c4d5bce925c66d8e38346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Gilli?= Date: Sun, 18 Sep 2016 14:43:54 +0200 Subject: [PATCH 7/7] Fix issue #2296: epub export with `+` in the title. --- src/Wallabag/CoreBundle/Helper/EntriesExport.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php index 0cf835b48..e91007e1b 100644 --- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php +++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php @@ -163,8 +163,12 @@ class EntriesExport $book->setSubject($tag['value']); } + // the reader in Kobo Devices doesn't likes special caracters + // in filenames, we limit to A-z/0-9 + $filename = preg_replace('/[^A-Za-z0-9\-]/', '', $entry->getTitle()); + $chapter = $content_start.$entry->getContent().$bookEnd; - $book->addChapter($entry->getTitle(), htmlspecialchars($entry->getTitle()).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD); + $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD); } return Response::create(