From 5958597ba6c54abe0922e1950f301f6f40cdb430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 3 Oct 2016 21:11:31 +0200 Subject: [PATCH] Prepare wallabag 2.1.1 --- CHANGELOG.md | 12 ++++++++++++ README.md | 3 ++- app/config/config.yml | 2 +- docs/de/user/installation.rst | 2 +- docs/de/user/upgrade-2.0.x-2.1.y.rst | 4 ++-- docs/en/user/installation.rst | 2 +- docs/en/user/upgrade-2.0.x-2.1.y.rst | 4 ++-- docs/fr/user/installation.rst | 2 +- docs/fr/user/upgrade-2.0.x-2.1.y.rst | 4 ++-- 9 files changed, 24 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf48ae386..11ba68ffa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [2.1.1] - 2016-10-03 + +### Changed + +- [#2340](https://github.com/wallabag/wallabag/pull/2340) Updated german translation (Strubbl) +- [#2341](https://github.com/wallabag/wallabag/pull/2341) Updated polish translation (Mateusz Rumiński) + +### Fixed + +- [#2338](https://github.com/wallabag/wallabag/pull/2338) Fixed 2.1 installation (Jeremy Benoist) +- [#2345](https://github.com/wallabag/wallabag/issues/2345) Fixed 2.0.x update (Jeremy Benoist) + ## [2.1.0] - 2016-10-03 ### Added diff --git a/README.md b/README.md index 0936f666b..048315c04 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,9 @@ Then you can install wallabag by executing the following commands: ``` git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.1.0 + git checkout 2.1.1 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 fbebfee7f..2475ada88 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.1.0 + version: 2.1.1 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 c438761f9..3578dca94 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -55,7 +55,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.1.0 + git checkout 2.1.1 --force SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/docs/de/user/upgrade-2.0.x-2.1.y.rst b/docs/de/user/upgrade-2.0.x-2.1.y.rst index 7319a18a4..8ee2ae597 100644 --- a/docs/de/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/de/user/upgrade-2.0.x-2.1.y.rst @@ -7,14 +7,14 @@ Wenn du den Import von Pocket durch das Hinzufügen des Consumer Key in den inte 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 zu aktualisieren, führe die folgenden Kommandos in deinem wallabag-Ordner aus (ersetze ``2.1.0`` 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 zu aktualisieren, führe die folgenden Kommandos in deinem wallabag-Ordner aus (ersetze ``2.1.1`` mit der neuesten Releasenummer): :: rm -rf var/cache/* git fetch origin git fetch --tags - git checkout 2.1.0 + git checkout 2.1.0 --force SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console doctrine:migrations:migrate --env=prod php bin/console cache:clear --env=prod diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 833a36a69..bab8f0a57 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -54,7 +54,7 @@ To install wallabag itself, you must run the following commands: git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.1.0 + git checkout 2.1.1 --force SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst index ce5b5441b..649ab6ca9 100644 --- a/docs/en/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst @@ -7,14 +7,14 @@ Before this migration, if you configured the Pocket import by adding your consum 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.1.0`` 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.1.1`` by the last release number): :: rm -rf var/cache/* git fetch origin git fetch --tags - git checkout 2.1.0 + git checkout 2.1.1 --force SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console doctrine:migrations:migrate --env=prod php bin/console cache:clear --env=prod diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index cba8444a7..fecdea0f2 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -52,7 +52,7 @@ Pour installer wallabag, vous devez exécuter ces commandes : git clone https://github.com/wallabag/wallabag.git cd wallabag - git checkout 2.1.0 + git checkout 2.1.1 --force SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod diff --git a/docs/fr/user/upgrade-2.0.x-2.1.y.rst b/docs/fr/user/upgrade-2.0.x-2.1.y.rst index a059cfb84..421362122 100644 --- a/docs/fr/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/fr/user/upgrade-2.0.x-2.1.y.rst @@ -7,14 +7,14 @@ Avant cette migration, si vous aviez configuré l'import depuis Pocket en ajouta 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.1.0`` 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.1.1`` par le numéro de la dernière version) : :: rm -rf var/cache/* git fetch origin git fetch --tags - git checkout 2.1.0 + git checkout 2.1.1 --force SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console doctrine:migrations:migrate --env=prod php bin/console cache:clear --env=prod