diff options
-rw-r--r-- | CHANGELOG.md | 22 | ||||
-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, 26 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 910eb5de..5377d1f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -2,6 +2,28 @@ | |||
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.2] - 2016-04-21 | ||
6 | |||
7 | ### Added | ||
8 | |||
9 | - [#1945](https://github.com/wallabag/wallabag/pull/1945) cURL examples in documentation about API (Dirk Deimeke) | ||
10 | - [#1911](https://github.com/wallabag/wallabag/pull/1911) Add title hover on entry titles (Thomas Citharel) | ||
11 | |||
12 | ### Changed | ||
13 | |||
14 | - [#1944](https://github.com/wallabag/wallabag/pull/1944), [#1953](https://github.com/wallabag/wallabag/pull/1953), [#1954](https://github.com/wallabag/wallabag/pull/1954) Due to branches renaming, update documentation and configuration (maxi62330, Nicolas Lœuillet) | ||
15 | - [#1942](https://github.com/wallabag/wallabag/pull/1942) Optimize import (Nicolas Lœuillet) | ||
16 | - [#1935](https://github.com/wallabag/wallabag/pull/1935) Update spanish translation (jami7) | ||
17 | - [#1929](https://github.com/wallabag/wallabag/pull/1929) Change guid and link in RSS feeds to give original entry URL (Nicolas Lœuillet) | ||
18 | - [#1918](https://github.com/wallabag/wallabag/pull/1918) Improve pagination when user has lot of entries (Nicolas Lœuillet) | ||
19 | - [#1916](https://github.com/wallabag/wallabag/pull/1916) Change PHP arrays and move test parameters in a separated file (Jeremy Benoist) | ||
20 | |||
21 | ### Fixed | ||
22 | |||
23 | - [#1957](https://github.com/wallabag/wallabag/pull/1957) Fix translation for `Go to your account` button (Nicolas Lœuillet) | ||
24 | - [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if refered is null (Nicolas Lœuillet) | ||
25 | - [#1912](https://github.com/wallabag/wallabag/pull/1912) Fix 500 Internal Server Error -> "Setting piwik_enabled couldn't be found" (Jeremy Benoist) | ||
26 | |||
5 | ## [2.0.1] - 2016-04-11 | 27 | ## [2.0.1] - 2016-04-11 |
6 | ### Added | 28 | ### Added |
7 | 29 | ||
@@ -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.1 | 19 | git checkout 2.0.2 |
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 3910f27b..f3068985 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.1 | 31 | version: 2.0.2 |
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 216a8607..78038322 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.1 | 53 | git checkout 2.0.2 |
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 3c647aac..47c2faa1 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.1 | 51 | git checkout 2.0.2 |
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 | ||