diff options
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | app/config/config.yml | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ad916426..c31d62b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,6 +1,12 @@ | |||
1 | ## Changelog | 1 | ## Changelog |
2 | 2 | ||
3 | ### 2.1.6 2017/01/17 | ||
4 | - [#2758](https://github.com/wallabag/wallabag/pull/2758) Fixed possible JS injection via the title edition (@nicosomb) | ||
5 | - [#2736](https://github.com/wallabag/wallabag/pull/2736) Update copyright year (@lex111) | ||
6 | - [#2624](https://github.com/wallabag/wallabag/pull/2624) Fix #2056 update config.yml (@Rurik19) | ||
7 | |||
3 | ### 2.1.5 2016/11/21 | 8 | ### 2.1.5 2016/11/21 |
9 | - [#2625](https://github.com/wallabag/wallabag/pull/2625) Prepare wallabag 2.1.5 (@nicosomb) | ||
4 | - [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r) | 10 | - [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r) |
5 | - [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb) | 11 | - [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb) |
6 | - [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb) | 12 | - [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb) |
@@ -94,7 +100,7 @@ | |||
94 | - [#2397](https://github.com/wallabag/wallabag/pull/2397) Ensure orphan tag are remove in API (@j0k3r) | 100 | - [#2397](https://github.com/wallabag/wallabag/pull/2397) Ensure orphan tag are remove in API (@j0k3r) |
95 | - [#2399](https://github.com/wallabag/wallabag/pull/2399) Use default locale for user config (@j0k3r) | 101 | - [#2399](https://github.com/wallabag/wallabag/pull/2399) Use default locale for user config (@j0k3r) |
96 | - [#2400](https://github.com/wallabag/wallabag/pull/2400) Set env to prod in documentation (@j0k3r) | 102 | - [#2400](https://github.com/wallabag/wallabag/pull/2400) Set env to prod in documentation (@j0k3r) |
97 | - [#2396](https://github.com/wallabag/wallabag/pull/2396) Update messages.pl.yml (@mruminski) | 103 | - [#2396](https://github.com/wallabag/wallabag/pull/2396) Update messages.pl.yml (@wallabag) |
98 | - [#2395](https://github.com/wallabag/wallabag/pull/2395) Add ability to use socket (@j0k3r) | 104 | - [#2395](https://github.com/wallabag/wallabag/pull/2395) Add ability to use socket (@j0k3r) |
99 | - [#2386](https://github.com/wallabag/wallabag/pull/2386) Changed Changelog by using github-changelog-generator from @skywinder (@nicosomb) | 105 | - [#2386](https://github.com/wallabag/wallabag/pull/2386) Changed Changelog by using github-changelog-generator from @skywinder (@nicosomb) |
100 | - [#2389](https://github.com/wallabag/wallabag/pull/2389) Added default picture if preview picture is null (@nicosomb) | 106 | - [#2389](https://github.com/wallabag/wallabag/pull/2389) Added default picture if preview picture is null (@nicosomb) |
diff --git a/app/config/config.yml b/app/config/config.yml index 3d9067d1..ca0ba1d8 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -30,7 +30,7 @@ framework: | |||
30 | assets: ~ | 30 | assets: ~ |
31 | 31 | ||
32 | wallabag_core: | 32 | wallabag_core: |
33 | version: 2.1.5 | 33 | version: 2.1.6 |
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' |
@@ -195,7 +195,7 @@ fos_oauth_server: | |||
195 | user_provider: fos_user.user_manager | 195 | user_provider: fos_user.user_manager |
196 | options: | 196 | options: |
197 | refresh_token_lifetime: 1209600 | 197 | refresh_token_lifetime: 1209600 |
198 | 198 | ||
199 | scheb_two_factor: | 199 | scheb_two_factor: |
200 | trusted_computer: | 200 | trusted_computer: |
201 | enabled: true | 201 | enabled: true |