From 1a5348a8b8c310188d0afc76f721c781addf38a2 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 17 May 2022 20:29:28 +0200 Subject: [PATCH 1/3] Prepare 2.5.0 release --- CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++ app/config/wallabag.yml | 2 +- composer.lock | 24 ++++++++++---------- 3 files changed, 62 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae2c63230..533c605d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,54 @@ # Changelog +## [2.5.0](https://github.com/wallabag/wallabag/tree/2.5.0) + [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.3...2.5.0) + +### Features + +- Add Delicious import by @j0k3r in https://github.com/wallabag/wallabag/pull/5022 +- Add route to list entries with annotations by @nicosomb in https://github.com/wallabag/wallabag/pull/4341 +- Add an option to sort the feed entries by `updated_at` by @agallou in https://github.com/wallabag/wallabag/pull/5659 +- Add support to download webp image locally by @j0k3r in https://github.com/wallabag/wallabag/pull/5687 +- Update readme and docker development env by @Kdecherf in https://github.com/wallabag/wallabag/pull/5662 +- Deprecate Baggy theme by @j0k3r in https://github.com/wallabag/wallabag/pull/5742 +- Add action to assign a search as a tag to each result by @nicosomb in https://github.com/wallabag/wallabag/pull/5381 +- Drop PHP prior to 7.4 by @yguedidi in https://github.com/wallabag/wallabag/pull/5791 +- Deprecate mobi export by @Kdecherf in https://github.com/wallabag/wallabag/pull/5775 + +### API + +- Add new endpoint for API: config by @nicosomb in https://github.com/wallabag/wallabag/pull/5673 + +### Technical stuff + +- Fix test with `usinenouvelle.com` being flaky these times by @j0k3r in https://github.com/wallabag/wallabag/pull/5686 +- Replace `iconv()` calls with Transliterator by @Kdecherf in https://github.com/wallabag/wallabag/pull/5680 +- Composer 2.3 isn't compatible with wallabag by @j0k3r in https://github.com/wallabag/wallabag/pull/5708 +- CI workaround for PHP < 7.4 & MySQL 8 by @j0k3r in https://github.com/wallabag/wallabag/pull/5729 +- Set permissions for GitHub actions by @naveensrinivasan in https://github.com/wallabag/wallabag/pull/5732 +- Included githubactions in the dependabot config by @naveensrinivasan in https://github.com/wallabag/wallabag/pull/5737 +- Remove bundle inheritance by @yguedidi in https://github.com/wallabag/wallabag/pull/5746 +- Fix SQLite database location by @yguedidi in https://github.com/wallabag/wallabag/pull/5771 +- Disable XDebug in test make recipe by @yguedidi in https://github.com/wallabag/wallabag/pull/5770 +- Exclude local phpunit.xml by @yguedidi in https://github.com/wallabag/wallabag/pull/5757 +- Upgrade PHP dependencies by @yguedidi in https://github.com/wallabag/wallabag/pull/5778 +- Merge branch 2.5.0 in master by @j0k3r in https://github.com/wallabag/wallabag/pull/5794 + +### Translations + +- Enabled greek translation by @nicosomb in https://github.com/wallabag/wallabag/pull/5656 + +### Fixes + +- Fix tagging rule match when user has a custom reading speed by @j0k3r in https://github.com/wallabag/wallabag/pull/5646 +- Feat/home entries updated by @Simounet in https://github.com/wallabag/wallabag/pull/5664 +- Fix row and card style regressions by @Simounet in https://github.com/wallabag/wallabag/pull/5676 +- Fix epub language by @j0k3r in https://github.com/wallabag/wallabag/pull/5647 +- material: improve mass buttons style, mostly for smartphone screens by @Kdecherf in https://github.com/wallabag/wallabag/pull/5695 +- Fix composer version in docker dev configuration by @nicosomb in https://github.com/wallabag/wallabag/pull/5715 +- Use site with subdomain as tagging rule example by @jonas-hagen in https://github.com/wallabag/wallabag/pull/5744 +- Fix PHP Docker image by @yguedidi in https://github.com/wallabag/wallabag/pull/5772 + ## [2.4.3](https://github.com/wallabag/wallabag/tree/2.4.3) [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.2...2.4.3) diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 5e182c8e8..b902a9ef5 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.4.3 + version: 2.5.0 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/composer.lock b/composer.lock index c0be4e4d0..e19578a99 100644 --- a/composer.lock +++ b/composer.lock @@ -5328,16 +5328,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.10.0", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4" + "reference": "d1bc565b23c2040fafde398a8a5db083c47928c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4", - "reference": "a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/d1bc565b23c2040fafde398a8a5db083c47928c0", + "reference": "d1bc565b23c2040fafde398a8a5db083c47928c0", "shasum": "" }, "require": { @@ -5423,7 +5423,7 @@ "type": "community_bridge" } ], - "time": "2022-05-04T15:16:15+00:00" + "time": "2022-05-17T10:57:52+00:00" }, { "name": "laminas/laminas-eventmanager", @@ -11249,16 +11249,16 @@ }, { "name": "twig/twig", - "version": "v2.14.13", + "version": "v2.15.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "66856cd0459df3dc97d32077a98454dc2a0ee75a" + "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/66856cd0459df3dc97d32077a98454dc2a0ee75a", - "reference": "66856cd0459df3dc97d32077a98454dc2a0ee75a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4", + "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4", "shasum": "" }, "require": { @@ -11274,7 +11274,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.14-dev" + "dev-master": "2.15-dev" } }, "autoload": { @@ -11313,7 +11313,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.14.13" + "source": "https://github.com/twigphp/Twig/tree/v2.15.1" }, "funding": [ { @@ -11325,7 +11325,7 @@ "type": "tidelift" } ], - "time": "2022-04-06T06:45:17+00:00" + "time": "2022-05-17T05:46:24+00:00" }, { "name": "wallabag/php-mobi", From 67ead77375b60de339af04018259337307a37fcc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 20 May 2022 15:47:07 +0200 Subject: [PATCH 2/3] Add deprecated section in changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 533c605d3..f428f7663 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,11 @@ - Add an option to sort the feed entries by `updated_at` by @agallou in https://github.com/wallabag/wallabag/pull/5659 - Add support to download webp image locally by @j0k3r in https://github.com/wallabag/wallabag/pull/5687 - Update readme and docker development env by @Kdecherf in https://github.com/wallabag/wallabag/pull/5662 -- Deprecate Baggy theme by @j0k3r in https://github.com/wallabag/wallabag/pull/5742 - Add action to assign a search as a tag to each result by @nicosomb in https://github.com/wallabag/wallabag/pull/5381 - Drop PHP prior to 7.4 by @yguedidi in https://github.com/wallabag/wallabag/pull/5791 + +### Deprecated features +- Deprecate Baggy theme by @j0k3r in https://github.com/wallabag/wallabag/pull/5742 - Deprecate mobi export by @Kdecherf in https://github.com/wallabag/wallabag/pull/5775 ### API @@ -32,7 +34,6 @@ - Disable XDebug in test make recipe by @yguedidi in https://github.com/wallabag/wallabag/pull/5770 - Exclude local phpunit.xml by @yguedidi in https://github.com/wallabag/wallabag/pull/5757 - Upgrade PHP dependencies by @yguedidi in https://github.com/wallabag/wallabag/pull/5778 -- Merge branch 2.5.0 in master by @j0k3r in https://github.com/wallabag/wallabag/pull/5794 ### Translations From db3e0dd175a75491e8e9e1e3879a4be3219336da Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 20 May 2022 16:11:07 +0200 Subject: [PATCH 3/3] Add info about translations --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f428f7663..c0fbb84f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ ### Translations - Enabled greek translation by @nicosomb in https://github.com/wallabag/wallabag/pull/5656 +- Translations update from Hosted Weblate by @weblate see https://github.com/wallabag/wallabag/pulls?q=is%3Apr+author%3Aweblate+milestone%3A2.5.0+is%3Amerged ### Fixes