aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-04-22 18:40:48 +0200
committerNicolas Lœuillet <nicolas@loeuillet.org>2016-04-22 18:40:48 +0200
commit9c0bc04cfe61e84e21e33b8f8a51161851455221 (patch)
treeb46bde99bffc5aeb31bf5f72031f098629fdf0e9
parent9481187896b00b126afbf05d70fe9fe3621937ec (diff)
parentdafde7fb2fa3b5fa6769470d7b7a6e843e77a3d5 (diff)
downloadwallabag-9c0bc04cfe61e84e21e33b8f8a51161851455221.tar.gz
wallabag-9c0bc04cfe61e84e21e33b8f8a51161851455221.tar.zst
wallabag-9c0bc04cfe61e84e21e33b8f8a51161851455221.zip
Merge pull request #1965 from wallabag/prepare-203
Prepare release 2.0.3
-rw-r--r--CHANGELOG.md10
-rw-r--r--README.md2
-rw-r--r--app/config/config.yml2
-rw-r--r--docs/en/user/installation.rst2
-rw-r--r--docs/fr/user/installation.rst2
5 files changed, 14 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5377d1f1..e6415983 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
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.3] - 2016-04-22
6
7### Added
8
9- [#1962](https://github.com/wallabag/wallabag/pull/1962) cURL examples in documentation about API (Dirk Deimeke)
10
11### Fixed
12
13- Forgot `composer.lock` file in 2.0.2 release so some users may encounter `Fatal error: Out of memory` error during installation
14
5## [2.0.2] - 2016-04-21 15## [2.0.2] - 2016-04-21
6 16
7### Added 17### Added
diff --git a/README.md b/README.md
index 14ace792..244fc3f9 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.2 19 git checkout 2.0.3
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 f3068985..9bc2661a 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
28 assets: ~ 28 assets: ~
29 29
30wallabag_core: 30wallabag_core:
31 version: 2.0.2 31 version: 2.0.3
32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
33 languages: 33 languages:
34 en: 'English' 34 en: 'English'
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 78038322..8250d2d7 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -50,7 +50,7 @@ To install wallabag itself, you must run these two commands:
50 50
51 git clone https://github.com/wallabag/wallabag.git 51 git clone https://github.com/wallabag/wallabag.git
52 cd wallabag 52 cd wallabag
53 git checkout 2.0.2 53 git checkout 2.0.3
54 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 54 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
55 php bin/console wallabag:install --env=prod 55 php bin/console wallabag:install --env=prod
56 56
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 47c2faa1..8282c474 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -48,7 +48,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
48 48
49 git clone https://github.com/wallabag/wallabag.git 49 git clone https://github.com/wallabag/wallabag.git
50 cd wallabag 50 cd wallabag
51 git checkout 2.0.2 51 git checkout 2.0.3
52 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 52 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
53 php bin/console wallabag:install --env=prod 53 php bin/console wallabag:install --env=prod
54 54