aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2019-01-11 14:16:41 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-01-11 14:16:41 +0100
commit3bed2e440ee4d548036221129c15427d055519ea (patch)
tree3555462322d1b8bfb41dc12f85287939e1bc31bb
parent3625833b2c0bce7a37ec2bd873e6bbb0b76c4a4e (diff)
downloadwallabag-3bed2e440ee4d548036221129c15427d055519ea.tar.gz
wallabag-3bed2e440ee4d548036221129c15427d055519ea.tar.zst
wallabag-3bed2e440ee4d548036221129c15427d055519ea.zip
Prepare 2.3.6 release
-rw-r--r--CHANGELOG.md14
-rw-r--r--app/config/wallabag.yml2
2 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52988f85..c116efb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
1# Changelog 1# Changelog
2 2
3## [2.3.6](https://github.com/wallabag/wallabag/tree/2.3.6)
4 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.5...2.3.6)
5
6### Fixes
7
8- Jump to 2.3.6-dev and update release process [#3814](https://github.com/wallabag/wallabag/pull/3814)
9- Fix tag API leak [#3823](https://github.com/wallabag/wallabag/pull/3823)
10- Validate imported entry to avoid error on import [#3816](https://github.com/wallabag/wallabag/pull/3816)
11- Fix incorrect reading time calculation for entries with CJK characters [#3820](https://github.com/wallabag/wallabag/pull/3820)
12- EntriesExport/epub: replace epub identifier with unique urn [#3827](https://github.com/wallabag/wallabag/pull/3827)
13- Fix settings field inverted [#3833](https://github.com/wallabag/wallabag/pull/3833)
14- Cast client id to avoid PG error [#3831](https://github.com/wallabag/wallabag/pull/3831)
15- Rework of EPUB/PDF exports [#3826](https://github.com/wallabag/wallabag/pull/3826)
16
3## [2.3.5](https://github.com/wallabag/wallabag/tree/2.3.5) 17## [2.3.5](https://github.com/wallabag/wallabag/tree/2.3.5)
4 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.4...2.3.5) 18 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.4...2.3.5)
5 19
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index d9a3d5dc..1b49a1eb 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
1wallabag_core: 1wallabag_core:
2 version: 2.3.6-dev 2 version: 2.3.6
3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
4 languages: 4 languages:
5 en: 'English' 5 en: 'English'