From ca879c36ded9d166be68fb51957de9b5d52c9f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 21 Aug 2023 10:51:17 +0200 Subject: [PATCH] Prepare wallabag 2.6.3 --- CHANGELOG.md | 34 +++++++++++++++++++ app/config/wallabag.yml | 2 +- composer.lock | 14 ++++---- .../Controller/DeveloperController.php | 1 - .../Resources/views/Config/index.html.twig | 8 ++--- .../Resources/views/Developer/index.html.twig | 2 +- 6 files changed, 47 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73ae842c5..75e96b07d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,39 @@ # Changelog +## [2.6.3](https://github.com/wallabag/wallabag/tree/2.6.3) +[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.2...2.6.3) + +### Security fixes +* Replace GET way to POST way to reset data user by @nicosomb https://github.com/wallabag/wallabag/commit/78b0b55c40511e1f22d5bbb4897aa10fca68441c +* Replace GET way to POST way to delete API client by @nicosomb https://github.com/wallabag/wallabag/commit/ffcc5c9062fcc8cd922d7d6d65edbe5efae96806 + +### Improvement +* Add confirmation before reload entry by @nicosomb https://github.com/wallabag/wallabag/pull/6778 +* Remove external dependencies on howto page by @viktoriussuwandi https://github.com/wallabag/wallabag/pull/6775 + +### Fixes +* Use Session instead of Referrer for Redirection by @Spoons https://github.com/wallabag/wallabag/pull/6119 +* Reduce risk of collision for #content by @kdecherf https://github.com/wallabag/wallabag/pull/6829 +* Update dependencies to fix vulnerabilities by @nicosomb https://github.com/wallabag/wallabag/pull/6783 +* Fix failing randomly test by @nicosomb https://github.com/wallabag/wallabag/pull/6763 + +### Technical stuff +* Add check if git is installed by @nicosomb https://github.com/wallabag/wallabag/pull/6788 +* Replace kernel.root_dir by kernel.project_dir by @yguedidi https://github.com/wallabag/wallabag/pull/6809 +* Split symfony/symfony by @yguedidi https://github.com/wallabag/wallabag/pull/6817 +* Make Crawler::extract get an array by @yguedidi https://github.com/wallabag/wallabag/pull/6812 +* Use PSR-17 and PSR-18 by @yguedidi https://github.com/wallabag/wallabag/pull/6816 +* Replace Client by KernelBrowser by @yguedidi https://github.com/wallabag/wallabag/pull/6813 +* Replace Debug component by ErrorHandler component by @yguedidi https://github.com/wallabag/wallabag/pull/6810 +* Make ImportController extends AbstractController by @yguedidi https://github.com/wallabag/wallabag/pull/6808 +* Use Twig instead of templating by @yguedidi https://github.com/wallabag/wallabag/pull/6797 +* Identify platforms by their class by @yguedidi https://github.com/wallabag/wallabag/pull/6799 +* Move from transchoice to trans by @yguedidi https://github.com/wallabag/wallabag/pull/6800 +* Replace GetResponseEvent by RequestEvent by @yguedidi https://github.com/wallabag/wallabag/pull/6811 +* Ensure the kernel is shut down before calling createClient by @yguedidi https://github.com/wallabag/wallabag/pull/6803 +* Ignore docker-compose.override.yml by @yguedidi https://github.com/wallabag/wallabag/pull/6814 +* Add composer normalizer by @nicosomb https://github.com/wallabag/wallabag/pull/6762 + ## [2.6.2](https://github.com/wallabag/wallabag/tree/2.6.2) [Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.1...2.6.2) diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d96a2cca2..2fb20b31f 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.6.2 + version: 2.6.3 paypal_url: "https://liberapay.com/wallabag/donate" languages: en: 'English' diff --git a/composer.lock b/composer.lock index 6ca0826dd..669b60a0e 100644 --- a/composer.lock +++ b/composer.lock @@ -4582,16 +4582,16 @@ }, { "name": "j0k3r/graby-site-config", - "version": "1.0.171", + "version": "1.0.173", "source": { "type": "git", "url": "https://github.com/j0k3r/graby-site-config.git", - "reference": "1551b7a2a446d60b59866671d7125059a8753ecb" + "reference": "e54353732d257639039d358972e8947b5d7f05d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/1551b7a2a446d60b59866671d7125059a8753ecb", - "reference": "1551b7a2a446d60b59866671d7125059a8753ecb", + "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/e54353732d257639039d358972e8947b5d7f05d2", + "reference": "e54353732d257639039d358972e8947b5d7f05d2", "shasum": "" }, "require": { @@ -4620,9 +4620,9 @@ "description": "Graby site config files", "support": { "issues": "https://github.com/j0k3r/graby-site-config/issues", - "source": "https://github.com/j0k3r/graby-site-config/tree/1.0.171" + "source": "https://github.com/j0k3r/graby-site-config/tree/1.0.173" }, - "time": "2023-07-24T08:25:40+00:00" + "time": "2023-08-21T09:46:59+00:00" }, { "name": "j0k3r/httplug-ssrf-plugin", @@ -17391,5 +17391,5 @@ "platform-overrides": { "php": "7.4.29" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/src/Wallabag/ApiBundle/Controller/DeveloperController.php b/src/Wallabag/ApiBundle/Controller/DeveloperController.php index 90f4d7529..0c08968e2 100644 --- a/src/Wallabag/ApiBundle/Controller/DeveloperController.php +++ b/src/Wallabag/ApiBundle/Controller/DeveloperController.php @@ -75,7 +75,6 @@ class DeveloperController extends AbstractController */ public function deleteClientAction(Request $request, Client $client, EntityManagerInterface $entityManager, TranslatorInterface $translator) { - if (!$this->isCsrfTokenValid('delete-client', $request->request->get('token'))) { throw $this->createAccessDeniedException('Bad CSRF token.'); } diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig index 30c39294f..c0d57c067 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig @@ -553,28 +553,28 @@
{{ 'config.reset.title'|trans }}

{{ 'config.reset.description'|trans }}

-

+

-

+

-

+

-

+ diff --git a/src/Wallabag/CoreBundle/Resources/views/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Developer/index.html.twig index ff2d1b8c7..379a79230 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Developer/index.html.twig @@ -57,7 +57,7 @@

{{ 'developer.remove.warn_message_1'|trans({'%name%': client.name}) }}

{{ 'developer.remove.warn_message_2'|trans({'%name%': client.name}) }}

- +