aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-08-10 15:03:43 +0200
committerGitHub <noreply@github.com>2016-08-10 15:03:43 +0200
commit8617972f3f947ba6ceaa872e18487a9172f95189 (patch)
treeee433ef4104c28ecef869d323af7ded57676a832
parent029965b6a21824602e0cddc8b6dcd859da38edc2 (diff)
parenta26f91dcb64217115550fb79092912e1fd4bacd3 (diff)
downloadwallabag-8617972f3f947ba6ceaa872e18487a9172f95189.tar.gz
wallabag-8617972f3f947ba6ceaa872e18487a9172f95189.tar.zst
wallabag-8617972f3f947ba6ceaa872e18487a9172f95189.zip
Merge pull request #2212 from wallabag/prepare-206
Prepare release 2.0.6
-rw-r--r--CHANGELOG.md16
-rw-r--r--README.md2
-rw-r--r--app/config/config.yml2
-rw-r--r--docs/de/user/installation.rst4
-rw-r--r--docs/en/user/installation.rst2
-rw-r--r--docs/fr/user/installation.rst2
6 files changed, 22 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97245c68..575d01cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
2 2
3All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). 3All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
4 4
5## [2.0.6] - 2016-08-10
6
7### Changed
8
9- [#2199](https://github.com/wallabag/wallabag/pull/2199) Handling socials links into a config file (Simon Alberny)
10- [#2172](https://github.com/wallabag/wallabag/pull/2172) Change the way to login user in tests (Jeremy Benoist)
11- [#2155](https://github.com/wallabag/wallabag/pull/2155) Use friendsofphp instead of fabpot for PHP CS Fixer (Jeremy Benoist)
12
13### Fixed
14
15- [#2200](https://github.com/wallabag/wallabag/pull/2200) Fixed typo in entry:notice:entry_saved (charno6)
16- [#2185](https://github.com/wallabag/wallabag/pull/2185) Fix 3rd-Party Apps links (Chrome & Firefox) (Thomas Citharel)
17- [#2165](https://github.com/wallabag/wallabag/pull/2165) Fix a few french translations typos (Thomas Citharel)
18- [#2157](https://github.com/wallabag/wallabag/pull/2157) Handle only upper or only lower reading filter (Jeremy Benoist)
19- [#2156](https://github.com/wallabag/wallabag/pull/2156) Try to find bad redirection after delete (Jeremy Benoist)
20
5## [2.0.5] - 2016-05-31 21## [2.0.5] - 2016-05-31
6 22
7### Added 23### Added
diff --git a/README.md b/README.md
index 0d87d7bb..ff363734 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Then you can install wallabag by executing the following commands:
16``` 16```
17 git clone https://github.com/wallabag/wallabag.git 17 git clone https://github.com/wallabag/wallabag.git
18 cd wallabag 18 cd wallabag
19 git checkout 2.0.5 19 git checkout 2.0.6
20 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 20 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
21 php bin/console wallabag:install --env=prod 21 php bin/console wallabag:install --env=prod
22 php bin/console server:run --env=prod 22 php bin/console server:run --env=prod
diff --git a/app/config/config.yml b/app/config/config.yml
index 6a8078cc..bce38268 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
30 assets: ~ 30 assets: ~
31 31
32wallabag_core: 32wallabag_core:
33 version: 2.0.5 33 version: 2.0.6
34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
35 languages: 35 languages:
36 en: 'English' 36 en: 'English'
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index 37a80170..0fc2f447 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:
54 54
55 git clone https://github.com/wallabag/wallabag.git 55 git clone https://github.com/wallabag/wallabag.git
56 cd wallabag 56 cd wallabag
57 git checkout 2.0.5 57 git checkout 2.0.6
58 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 58 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
59 php bin/console wallabag:install --env=prod 59 php bin/console wallabag:install --env=prod
60 60
@@ -73,7 +73,7 @@ Und wallabag unter http://deineserverip:8000 erreichen
73Auf einem geteilten Webhosting 73Auf einem geteilten Webhosting
74~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 74~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
75 75
76Wir stellen ein Paket inkl. aller Abhängigkeiten bereit. 76Wir stellen ein Paket inkl. aller Abhängigkeiten bereit.
77Die Standardkonfiguration nutzt SQLite für die Datenbank. Wenn du diese Einstellung ändern willst, ändere bitte ``app/config/parameters.yml``. 77Die Standardkonfiguration nutzt SQLite für die Datenbank. Wenn du diese Einstellung ändern willst, ändere bitte ``app/config/parameters.yml``.
78 78
79Wir haben bereits einen Nutzer erstellt: Login und Passwort sind ``wallabag``. 79Wir 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 bd3095e0..0aa391e8 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:
53 53
54 git clone https://github.com/wallabag/wallabag.git 54 git clone https://github.com/wallabag/wallabag.git
55 cd wallabag 55 cd wallabag
56 git checkout 2.0.5 56 git checkout 2.0.6
57 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 57 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
58 php bin/console wallabag:install --env=prod 58 php bin/console wallabag:install --env=prod
59 59
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 0693fc5d..069396cc 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 :
51 51
52 git clone https://github.com/wallabag/wallabag.git 52 git clone https://github.com/wallabag/wallabag.git
53 cd wallabag 53 cd wallabag
54 git checkout 2.0.5 54 git checkout 2.0.6
55 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 55 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
56 php bin/console wallabag:install --env=prod 56 php bin/console wallabag:install --env=prod
57 57