aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-18 10:24:55 +0100
committerGitHub <noreply@github.com>2016-11-18 10:24:55 +0100
commit8853914ba4fdc42d9676598e3db79a4d07e3b697 (patch)
treeea54b7630ef7e79598c0a9eea6c83325163e2d83
parent19d401b15c1151bfa6c2364f31cc1eb87e7c99ef (diff)
parent5d2971cadd6d95ac89fcd05a206b0609919e117f (diff)
downloadwallabag-8853914ba4fdc42d9676598e3db79a4d07e3b697.tar.gz
wallabag-8853914ba4fdc42d9676598e3db79a4d07e3b697.tar.zst
wallabag-8853914ba4fdc42d9676598e3db79a4d07e3b697.zip
Merge pull request #2596 from wallabag/prepare-214
Prepare wallabag 2.1.4 :rocket:
-rw-r--r--CHANGELOG.md19
-rw-r--r--app/config/config.yml2
2 files changed, 20 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a835117..5cec7fe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,25 @@
1## Changelog 1## Changelog
2 2
3### 2.1.4 2016/11/18
4- [#2550](https://github.com/wallabag/wallabag/pull/2550) Reordered documentation (@jlnostr, @nicosomb)
5- [#2578](https://github.com/wallabag/wallabag/pull/2578) Added help on config screen (@nicosomb)
6- [#2570](https://github.com/wallabag/wallabag/pull/2570) Added creation date on entries view (@nicosomb)
7- [#2587](https://github.com/wallabag/wallabag/pull/2587) User-agents have moved to site-config (@j0k3r)
8- [#2584](https://github.com/wallabag/wallabag/pull/2584) fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony (@blankoworld)
9- [#2577](https://github.com/wallabag/wallabag/pull/2577) Added tooltips in header bar (@nicosomb)
10- [#2562](https://github.com/wallabag/wallabag/pull/2562) Bigger image preview in case of only image content (@j0k3r)
11- [#2571](https://github.com/wallabag/wallabag/pull/2571) Changed behavior when we change language (@nicosomb)
12- [#2565](https://github.com/wallabag/wallabag/pull/2565) Removed support website on about page (@nicosomb)
13- [#2563](https://github.com/wallabag/wallabag/pull/2563) Improve PR template (@j0k3r)
14- [#2561](https://github.com/wallabag/wallabag/pull/2561) fix #2559 (@Rurik19)
15- [#2555](https://github.com/wallabag/wallabag/pull/2555) Reorder variable assignation in update.sh script, fix #2554 (@dkrmr)
16- [#2556](https://github.com/wallabag/wallabag/pull/2556) Replaced TokenStorage with TokenStorageInterface (@nicosomb)
17- [#2552](https://github.com/wallabag/wallabag/pull/2552) Round readingtime to avoid crazy number (@j0k3r)
18- [#2546](https://github.com/wallabag/wallabag/pull/2546) Updated default parameters.yml file in documentation (@nicosomb)
19- [#2545](https://github.com/wallabag/wallabag/pull/2545) Update the upgrade documentation (@nicosomb)
20
3### 2.1.3 2016/11/04 21### 2.1.3 2016/11/04
22- [#2536](https://github.com/wallabag/wallabag/pull/2536) Prepare wallabag 2.1.3 :rocket: (@nicosomb)
4- [#2460](https://github.com/wallabag/wallabag/pull/2460) UI Changes (@tcitworld, @j0k3r) 23- [#2460](https://github.com/wallabag/wallabag/pull/2460) UI Changes (@tcitworld, @j0k3r)
5- [#2534](https://github.com/wallabag/wallabag/pull/2534) Use created_at as default sort (@j0k3r) 24- [#2534](https://github.com/wallabag/wallabag/pull/2534) Use created_at as default sort (@j0k3r)
6- [#2530](https://github.com/wallabag/wallabag/pull/2530) Added documentation about failed to load external entity error (@j0k3r, @Strubbl, @nicosomb) 25- [#2530](https://github.com/wallabag/wallabag/pull/2530) Added documentation about failed to load external entity error (@j0k3r, @Strubbl, @nicosomb)
diff --git a/app/config/config.yml b/app/config/config.yml
index 7107d4c6..1ab3c416 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
30 assets: ~ 30 assets: ~
31 31
32wallabag_core: 32wallabag_core:
33 version: 2.1.3 33 version: 2.1.4
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'