aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-08-22 10:40:24 +0200
committerGitHub <noreply@github.com>2016-08-22 10:40:24 +0200
commit80bb0b73445092c4aa3e94f90cc5f8667fa123ba (patch)
tree5636ca1ac1eb54dceb2d2e3371b04eb5beb110a1
parentc649d433810906571995a60eb6a486766e4875cf (diff)
parent5068544e10089b9c0dd3c98c5b3be1a5f4208903 (diff)
downloadwallabag-80bb0b73445092c4aa3e94f90cc5f8667fa123ba.tar.gz
wallabag-80bb0b73445092c4aa3e94f90cc5f8667fa123ba.tar.zst
wallabag-80bb0b73445092c4aa3e94f90cc5f8667fa123ba.zip
Merge pull request #2226 from wallabag/prepare-207
Prepare wallabag 2.0.7
-rw-r--r--CHANGELOG.md17
-rw-r--r--README.md2
-rw-r--r--app/config/config.yml2
-rw-r--r--docs/de/user/installation.rst2
-rw-r--r--docs/en/user/installation.rst2
-rw-r--r--docs/fr/user/installation.rst2
6 files changed, 22 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 575d01cf..a6f7e168 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
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.7] - 2016-08-22
6
7### Added
8
9- [#2222](https://github.com/wallabag/wallabag/pull/2222) Added creation date and reading time on article view (Nicolas Lœuillet)
10- [#2134](https://github.com/wallabag/wallabag/pull/2134) Run tests on an uptodate HHVM (Jeremy Benoist)
11
12### Changed
13
14- [#2221](https://github.com/wallabag/wallabag/pull/2221) Replaced favorite word/icon with star one (Nicolas Lœuillet)
15
16### Fixed
17
18- [#2224](https://github.com/wallabag/wallabag/pull/2224) Avoid breaking import when fetching fail (Jeremy Benoist)
19- [#2216](https://github.com/wallabag/wallabag/pull/2216), [#2220](https://github.com/wallabag/wallabag/pull/2220) Enable CORS headers for OAUTH part (Rurik19)
20- [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (Nicolas Lœuillet)
21
5## [2.0.6] - 2016-08-10 22## [2.0.6] - 2016-08-10
6 23
7### Changed 24### Changed
diff --git a/README.md b/README.md
index a6973466..6053e6d9 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.6 19 git checkout 2.0.7
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 72c854ab..49b325a2 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.6 33 version: 2.0.7
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 0fc2f447..1b6710b7 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.6 57 git checkout 2.0.7
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
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 0aa391e8..95df263a 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.6 56 git checkout 2.0.7
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 069396cc..d46f79a4 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.6 54 git checkout 2.0.7
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