diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2018-06-19 07:44:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 07:44:48 +0000 |
| commit | e586d65b64089fc1cc230a18c470aae3f45f91a6 (patch) | |
| tree | 5ea40b62ce665a8bab6a3e280a47f3be11838e27 | |
| parent | 7ebd4bdcf7427abcdf3e3938c9b8a3b9bb66bfbb (diff) | |
| parent | 7ddba6774573b08bdc62c89b5335560149cecf25 (diff) | |
| download | wallabag-e586d65b64089fc1cc230a18c470aae3f45f91a6.tar.gz wallabag-e586d65b64089fc1cc230a18c470aae3f45f91a6.tar.zst wallabag-e586d65b64089fc1cc230a18c470aae3f45f91a6.zip | |
Merge pull request #3675 from wallabag/prepare-2.3.3
Prepare 2.3.3 release
| -rw-r--r-- | CHANGELOG.md | 24 | ||||
| -rw-r--r-- | app/config/wallabag.yml | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b2626153..73fe6798 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,5 +1,29 @@ | |||
| 1 | # Changelog | 1 | # Changelog |
| 2 | 2 | ||
| 3 | ## [2.3.3](https://github.com/wallabag/wallabag/tree/2.3.3) | ||
| 4 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.2...2.3.3) | ||
| 5 | |||
| 6 | ### Fixes | ||
| 7 | |||
| 8 | - Fix error when withRemove variable is not defined. [#3573](https://github.com/wallabag/wallabag/pull/3573) | ||
| 9 | - Fix title card HTML parsing [#3592](https://github.com/wallabag/wallabag/pull/3592) | ||
| 10 | - Fix tests [#3597](https://github.com/wallabag/wallabag/pull/3597) | ||
| 11 | - Fix tests [#3619](https://github.com/wallabag/wallabag/pull/3619) | ||
| 12 | - Better encoding of the URI for the bookmarklet [#3616](https://github.com/wallabag/wallabag/pull/3616) | ||
| 13 | - Fix overflow wrap issue [#3652](https://github.com/wallabag/wallabag/pull/3652) | ||
| 14 | - Fix/firefox mobile unneeded resize [#3653](https://github.com/wallabag/wallabag/pull/3653) | ||
| 15 | - Fix srcset attribute on images downloaded [#3661](https://github.com/wallabag/wallabag/pull/3661) | ||
| 16 | - Fix authors and preview alt encoding display [#3664](https://github.com/wallabag/wallabag/pull/3664) | ||
| 17 | - Spelling: GitHub, Log out, of the dev [#3614](https://github.com/wallabag/wallabag/pull/3614) | ||
| 18 | - Fix tests [#3668](https://github.com/wallabag/wallabag/pull/3668) | ||
| 19 | - Fixed migrations with dash into db names [#3538](https://github.com/wallabag/wallabag/pull/3538) | ||
| 20 | |||
| 21 | ### Changes | ||
| 22 | |||
| 23 | - Allow login by email [#3615](https://github.com/wallabag/wallabag/pull/3615) | ||
| 24 | - Occitan update [#3646](https://github.com/wallabag/wallabag/pull/3646) | ||
| 25 | - Highlight code in articles using highlight.js [#3636](https://github.com/wallabag/wallabag/pull/3636) | ||
| 26 | |||
| 3 | ## [2.3.2](https://github.com/wallabag/wallabag/tree/2.3.2) | 27 | ## [2.3.2](https://github.com/wallabag/wallabag/tree/2.3.2) |
| 4 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.1...2.3.2) | 28 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.1...2.3.2) |
| 5 | 29 | ||
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index b155d159..d2476959 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | wallabag_core: | 1 | wallabag_core: |
| 2 | version: 2.3.2 | 2 | version: 2.3.3 |
| 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' |