Prepare release 2.0.6

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97245c68cde0ccb54a7bf92ef1b35e9c7678ad59..575d01cf60d95a8f401768ef9c1ae09818405878 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.6] - 2016-08-10
+
+### Changed
+
+- [#2199](https://github.com/wallabag/wallabag/pull/2199) Handling socials links into a config file (Simon Alberny)
+- [#2172](https://github.com/wallabag/wallabag/pull/2172) Change the way to login user in tests (Jeremy Benoist)
+- [#2155](https://github.com/wallabag/wallabag/pull/2155) Use friendsofphp instead of fabpot for PHP CS Fixer (Jeremy Benoist)
+
+### Fixed
+
+- [#2200](https://github.com/wallabag/wallabag/pull/2200) Fixed typo in entry:notice:entry_saved (charno6)
+- [#2185](https://github.com/wallabag/wallabag/pull/2185) Fix 3rd-Party Apps links (Chrome & Firefox) (Thomas Citharel)
+- [#2165](https://github.com/wallabag/wallabag/pull/2165) Fix a few french translations typos (Thomas Citharel)
+- [#2157](https://github.com/wallabag/wallabag/pull/2157) Handle only upper or only lower reading filter (Jeremy Benoist)
+- [#2156](https://github.com/wallabag/wallabag/pull/2156) Try to find bad redirection after delete (Jeremy Benoist)
+
 ## [2.0.5] - 2016-05-31
 
 ### Added

diff --git a/README.md b/README.md
index 0d87d7bb332210eb6bfe09f418d86297a60f11f1..ff36373461bfb3eb2788d92fd539d2d22852c178 100644 (file)
--- 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.5
+    git checkout 2.0.6
     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 6a8078ccdf1c8195d63f8f96254c64da3f19f0fc..bce3826813138bb5a64864f42928d60553c30b37 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.0.5
+    version: 2.0.6
     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 37a8017070bccdbf5b21ac637f0dc1e9d42f5116..0fc2f44737d08ded85856ec87dda28d948fc4523 100644 (file)
--- 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.5
+    git checkout 2.0.6
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
@@ -73,7 +73,7 @@ Und wallabag unter http://deineserverip:8000 erreichen
 Auf einem geteilten Webhosting
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Wir stellen ein Paket inkl. aller Abhängigkeiten bereit. 
+Wir stellen ein Paket inkl. aller Abhängigkeiten bereit.
 Die Standardkonfiguration nutzt SQLite für die Datenbank. Wenn du diese Einstellung ändern willst, ändere bitte ``app/config/parameters.yml``.
 
 Wir haben bereits einen Nutzer erstellt: Login und Passwort sind ``wallabag``.

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index bd3095e03752d55e630c74a6f215decc03f55803..0aa391e8416e9a650c577207973e1dd846634f4e 100644 (file)
--- 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.5
+    git checkout 2.0.6
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 

diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 0693fc5d33542782a274dcd0e0f5c43556a4df0c..069396cc9e6a3f9a715bd0d46840f226ae20c0d3 100644 (file)
--- 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.5
+    git checkout 2.0.6
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod