diff options
-rw-r--r-- | CHANGELOG.md | 20 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | app/config/config.yml | 2 | ||||
-rw-r--r-- | docs/en/user/installation.rst | 4 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 2 |
5 files changed, 25 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fcc9dfbb..97245c68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -2,6 +2,26 @@ | |||
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 | ## [2.0.5] - 2016-05-31 | ||
6 | |||
7 | ### Added | ||
8 | |||
9 | - [#2052](https://github.com/wallabag/wallabag/pull/2052) Add unread filter to entries pages (Dan Bartram) | ||
10 | |||
11 | ### Changed | ||
12 | |||
13 | - [#2093](https://github.com/wallabag/wallabag/pull/2093) Replace vertical dots in material theme with horizontal dots (Nicolas Lœuillet) | ||
14 | - [#2054](https://github.com/wallabag/wallabag/pull/2054) Update italian translation (Daniele Conca) | ||
15 | - [#2068](https://github.com/wallabag/wallabag/pull/2068), [#2049](https://github.com/wallabag/wallabag/pull/2049) Update documentation (Josh Panter, Mario Vormstein) | ||
16 | |||
17 | ### Fixed | ||
18 | |||
19 | - [#2122](https://github.com/wallabag/wallabag/pull/2122) Fix the deletion of Tags/Entries relation when delete an entry (Jeremy Benoist, Nicolas Lœuillet) | ||
20 | - [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (Nicolas Lœuillet) | ||
21 | - [#2092](https://github.com/wallabag/wallabag/pull/2092) API: Starred and archived clears if article is already exists (Rurik19) | ||
22 | - [#2097](https://github.com/wallabag/wallabag/issues/2097) Fix image path in 2-factor authentification email (Baptiste Mille-Mathias) | ||
23 | - [#2069](https://github.com/wallabag/wallabag/pull/2069) Do not specify language in Firefox addon link (Merouane Atig) | ||
24 | |||
5 | ## [2.0.4] - 2016-05-07 | 25 | ## [2.0.4] - 2016-05-07 |
6 | 26 | ||
7 | ### Added | 27 | ### Added |
@@ -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.4 | 19 | git checkout 2.0.5 |
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 689cccec..ea028d85 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.4 | 31 | version: 2.0.5 |
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 6d804304..94ee05d4 100644 --- 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: | |||
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.4 | 56 | git checkout 2.0.5 |
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 | ||
@@ -258,7 +258,7 @@ It has to be the same for the following folders | |||
258 | * /var/www/wallabag/bin/ | 258 | * /var/www/wallabag/bin/ |
259 | * /var/www/wallabag/app/config/ | 259 | * /var/www/wallabag/app/config/ |
260 | * /var/www/wallabag/vendor/ | 260 | * /var/www/wallabag/vendor/ |
261 | * /var/www/wallabag/data/ | 261 | * /var/www/wallabag/data/ |
262 | 262 | ||
263 | by entering | 263 | by entering |
264 | 264 | ||
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 8f9a7932..b1136c12 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.4 | 54 | git checkout 2.0.5 |
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 | ||