diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-04-11 11:11:42 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-04-11 11:13:02 +0200 |
commit | d098cb04a846524aed151b9c0af4c4f390596e2c (patch) | |
tree | 60374fb73a97dbc1d359541c78f42b04f10c8dc6 | |
parent | 574d101561b0301dcca3e775d63c71fd819b5850 (diff) | |
download | wallabag-d098cb04a846524aed151b9c0af4c4f390596e2c.tar.gz wallabag-d098cb04a846524aed151b9c0af4c4f390596e2c.tar.zst wallabag-d098cb04a846524aed151b9c0af4c4f390596e2c.zip |
Prepare release 2.0.1
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | app/config/config.yml | 2 | ||||
-rw-r--r-- | docs/en/user/installation.rst | 2 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index edab7936..910eb5de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). | 3 | All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). |
4 | 4 | ||
5 | ## [Unreleased] | 5 | ## [2.0.1] - 2016-04-11 |
6 | ### Added | 6 | ### Added |
7 | 7 | ||
8 | - [Documentation about importing large file](http://doc.wallabag.org/en/v2/user/installation.html#installing-on-nginx) into nginx. (Nicolas Lœuillet) | 8 | - [Documentation about importing large file](http://doc.wallabag.org/en/v2/user/installation.html#installing-on-nginx) into nginx. (Nicolas Lœuillet) |
@@ -37,7 +37,7 @@ All notable changes to this project will be documented in this file. This projec | |||
37 | - [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (Nicolas Lœuillet) | 37 | - [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (Nicolas Lœuillet) |
38 | - [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (Mathieu Bruyen) | 38 | - [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (Mathieu Bruyen) |
39 | 39 | ||
40 | ## [2.0.0] - 2016-04-04 | 40 | ## [2.0.0] - 2016-04-03 |
41 | ### Added | 41 | ### Added |
42 | 42 | ||
43 | * save an article, read it, favorite it, archive it. (Hopefully) | 43 | * save an article, read it, favorite it, archive it. (Hopefully) |
@@ -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.0 | 19 | git checkout 2.0.1 |
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 86188455..3910f27b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -28,7 +28,7 @@ framework: | |||
28 | assets: ~ | 28 | assets: ~ |
29 | 29 | ||
30 | wallabag_core: | 30 | wallabag_core: |
31 | version: 2.0.0 | 31 | version: 2.0.1 |
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 182ed418..2c6b0331 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.0 | 53 | git checkout 2.0.1 |
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 42208871..0a1da6c8 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.0 | 51 | git checkout 2.0.1 |
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 | ||