diff --git a/CHANGELOG.md b/CHANGELOG.md index d176879ef..f564ee604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [2.6.13](https://github.com/wallabag/wallabag/tree/2.6.13) +[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.12...2.6.13) + +### Improvements + +* Add support of Pocket CSV import by @kdecherf and @nicosomb in [https://github.com/wallabag/wallabag/pull/8240](https://github.com/wallabag/wallabag/pull/8240) +* Backport Pocket and Shaarli HTML imports from master by @nicosomb in [https://github.com/wallabag/wallabag/pull/8193](https://github.com/wallabag/wallabag/pull/8193) + +### Fixes + +* Avoid non-validated OTP to be enabled #8139 by @j0k3r in [https://github.com/wallabag/wallabag/pull/8139](https://github.com/wallabag/wallabag/pull/8139) + +### Technical stuff + +* Update j0k3r/php-readability:1.2.13 to fix regression (about latin1 instead of UTF-8 used for entries) by @nicosomb [https://github.com/wallabag/wallabag/pull/8194](https://github.com/wallabag/wallabag/pull/8194) + ## [2.6.12](https://github.com/wallabag/wallabag/tree/2.6.12) [Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.11...2.6.12) diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 44cadc57d..34bcd0815 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.6.12 + version: 2.6.13 paypal_url: "https://liberapay.com/wallabag/donate" languages: en: 'English' diff --git a/composer.json b/composer.json index 6f2036df8..65d8e2c17 100644 --- a/composer.json +++ b/composer.json @@ -37,9 +37,6 @@ "email": "hello@wallabag.org", "issues": "https://github.com/wallabag/wallabag/issues" }, - "_comment": [ - "j0k3r/php-readability is pinned to 1.2.10 due to a regression in 1.2.12" - ], "require": { "php": ">=7.4", "ext-ctype": "*", @@ -83,7 +80,7 @@ "html2text/html2text": "^4.3.1", "incenteev/composer-parameter-handler": "^2.1.5", "j0k3r/graby": "^2.4.5", - "j0k3r/php-readability": "1.2.10", + "j0k3r/php-readability": "^1.2.13", "javibravo/simpleue": "^2.1", "jms/serializer": "^3.29.1", "jms/serializer-bundle": "^5.3.1", diff --git a/composer.lock b/composer.lock index 514f40e5b..7e8bd499d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "931e1540547040b66585959dcbbd4e30", + "content-hash": "f55cde30f67f014d2bf0b589a2fbe5c4", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -4719,16 +4719,16 @@ }, { "name": "j0k3r/php-readability", - "version": "1.2.10", + "version": "1.2.13", "source": { "type": "git", "url": "https://github.com/j0k3r/php-readability.git", - "reference": "563835730692eb369a73fe4bb9a1b44a603c4ce7" + "reference": "b9dde0f4cd46e9fc082bb37f75dc94ecd2f8faad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/563835730692eb369a73fe4bb9a1b44a603c4ce7", - "reference": "563835730692eb369a73fe4bb9a1b44a603c4ce7", + "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/b9dde0f4cd46e9fc082bb37f75dc94ecd2f8faad", + "reference": "b9dde0f4cd46e9fc082bb37f75dc94ecd2f8faad", "shasum": "" }, "require": { @@ -4740,7 +4740,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", "monolog/monolog": "^1.24|^2.1", - "symfony/phpunit-bridge": "^4.4|^5.3" + "symfony/phpunit-bridge": "^4.4|^5.3|^6.0|^7.0" }, "suggest": { "ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure." @@ -4790,7 +4790,7 @@ ], "support": { "issues": "https://github.com/j0k3r/php-readability/issues", - "source": "https://github.com/j0k3r/php-readability/tree/1.2.10" + "source": "https://github.com/j0k3r/php-readability/tree/1.2.13" }, "funding": [ { @@ -4798,7 +4798,7 @@ "type": "github" } ], - "time": "2022-06-13T04:15:24+00:00" + "time": "2025-06-03T08:02:58+00:00" }, { "name": "javibravo/simpleue",