Merge pull request #2035 from wallabag/prepare-204

Prepare wallabag 2.0.4

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6415983833397f5582200cadcea1dc604f57ca4..fcc9dfbb036aad4864f7e29b4b8e0b5aa93f6f17 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.4] - 2016-05-07
+
+### Added
+
+- [#2016](https://github.com/wallabag/wallabag/pull/2016) Big updates in [our documentation](http://doc.wallabag.org/en/master/) (Nicolas Lœuillet)
+- [#2028](https://github.com/wallabag/wallabag/pull/2028) Documentation about android application (Strubbl)
+- [#2019](https://github.com/wallabag/wallabag/pull/2019) Italian translation (Daniele Conca)
+- [#2011](https://github.com/wallabag/wallabag/pull/2011) Documentation about wallabag upgrade (biva)
+- [#1985](https://github.com/wallabag/wallabag/pull/1985) Documentation about rights access (FoxMaSk)
+- [#1969](https://github.com/wallabag/wallabag/pull/1969) Third resources for API in documentation (Nicolas Lœuillet)
+- [#1967](https://github.com/wallabag/wallabag/pull/1967) FAQ page in documentation (Nicolas Lœuillet)
+
+### Changed
+
+- [#1977](https://github.com/wallabag/wallabag/pull/1977) Spanish documentation (jami7)
+
+### Fixed
+
+- [#2023](https://github.com/wallabag/wallabag/pull/2023) Fix translation for validators (Nicolas Lœuillet)
+- [#2020](https://github.com/wallabag/wallabag/pull/2020) Fix number of entries in tag/list (Nicolas Lœuillet)
+- [#2022](https://github.com/wallabag/wallabag/pull/2022) Fix pagination bar on small devices (Nicolas Lœuillet)
+- [#2013](https://github.com/wallabag/wallabag/pull/2013) Fix tag listing (Nicolas Lœuillet)
+- [#1976](https://github.com/wallabag/wallabag/pull/1976) Fix filter reading time (Nicolas Lœuillet)
+- [#2005](https://github.com/wallabag/wallabag/pull/2005) Fix reading speed not defined when user was created via config page (Nicolas Lœuillet)
+- [#2010](https://github.com/wallabag/wallabag/pull/2010) Set the title via POST /api/entries (Nicolas Lœuillet)
+
 ## [2.0.3] - 2016-04-22
 
 ### Added

diff --git a/README.md b/README.md
index cad6ddf3dc4f5b892ebf6ed136213d8deb7568f8..cbe4c831ae216592a7e891a79ceb424ec7911c94 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.3
+    git checkout 2.0.4
     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 4d5ea38642eb5f1b3e23699b14ffb3ed0a5b8c6c..689ccceccefe5ff0b6e6f9f43d3f40492a81171c 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.0.3
+    version: 2.0.4
     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/en/user/installation.rst b/docs/en/user/installation.rst
index d22f8549bf994f5e012b41dd4228b23bfbe48a01..8d1859cb5db2b344a14498a6a21ce43db2d2d190 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 these two commands:
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.3
+    git checkout 2.0.4
     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 8f2ae25d2c5e9573fb533ad1f7ae3c2daa3ec003..6f1a459126a6ec3d95506c3ba0a08636641e6710 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.3
+    git checkout 2.0.4
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod