From 8635a2d5c3bbf260885d3c01f3f5f93e5039f159 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 03:06:56 +0000 Subject: [PATCH 01/22] Bump the phpstan-dependencies group with 2 updates Bumps the phpstan-dependencies group with 2 updates: [phpstan/phpstan](https://github.com/phpstan/phpstan) and [phpstan/phpstan-doctrine](https://github.com/phpstan/phpstan-doctrine). Updates `phpstan/phpstan` from 1.12.8 to 1.12.9 - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/2.0.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.12.8...1.12.9) Updates `phpstan/phpstan-doctrine` from 1.5.5 to 1.5.6 - [Release notes](https://github.com/phpstan/phpstan-doctrine/releases) - [Commits](https://github.com/phpstan/phpstan-doctrine/compare/1.5.5...1.5.6) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-patch dependency-group: phpstan-dependencies - dependency-name: phpstan/phpstan-doctrine dependency-type: direct:development update-type: version-update:semver-patch dependency-group: phpstan-dependencies ... Signed-off-by: dependabot[bot] --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 35e945d2f..d346e211c 100644 --- a/composer.lock +++ b/composer.lock @@ -17187,16 +17187,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.8", + "version": "1.12.9", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c" + "reference": "ceb937fb39a92deabc02d20709cf14b2c452502c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c", - "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ceb937fb39a92deabc02d20709cf14b2c452502c", + "reference": "ceb937fb39a92deabc02d20709cf14b2c452502c", "shasum": "" }, "require": { @@ -17241,20 +17241,20 @@ "type": "github" } ], - "time": "2024-11-06T19:06:49+00:00" + "time": "2024-11-10T17:10:04+00:00" }, { "name": "phpstan/phpstan-doctrine", - "version": "1.5.5", + "version": "1.5.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "4e9c77fc7bc3293f773fb2d8155c99572a3c89a4" + "reference": "8ba022846e79238872e315fff61e19b42ba2f139" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/4e9c77fc7bc3293f773fb2d8155c99572a3c89a4", - "reference": "4e9c77fc7bc3293f773fb2d8155c99572a3c89a4", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/8ba022846e79238872e315fff61e19b42ba2f139", + "reference": "8ba022846e79238872e315fff61e19b42ba2f139", "shasum": "" }, "require": { @@ -17311,9 +17311,9 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.5.5" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.5.6" }, - "time": "2024-10-29T12:19:49+00:00" + "time": "2024-11-09T17:34:01+00:00" }, { "name": "phpstan/phpstan-phpunit", From 7f7fcd8eca04030ea3d2454303b99155cc365c61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 03:07:37 +0000 Subject: [PATCH 02/22] Bump nelmio/api-doc-bundle from 4.33.3 to 4.33.4 Bumps [nelmio/api-doc-bundle](https://github.com/nelmio/NelmioApiDocBundle) from 4.33.3 to 4.33.4. - [Release notes](https://github.com/nelmio/NelmioApiDocBundle/releases) - [Changelog](https://github.com/nelmio/NelmioApiDocBundle/blob/master/CHANGELOG.md) - [Commits](https://github.com/nelmio/NelmioApiDocBundle/compare/v4.33.3...v4.33.4) --- updated-dependencies: - dependency-name: nelmio/api-doc-bundle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index 35e945d2f..bb463e9d7 100644 --- a/composer.lock +++ b/composer.lock @@ -5626,16 +5626,16 @@ }, { "name": "nelmio/api-doc-bundle", - "version": "v4.33.3", + "version": "v4.33.4", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "2384711daffaf01ab30d14743a5ce3422bbe8246" + "reference": "c43171895161c8eb342bc5fc5eb21760dd91b646" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/2384711daffaf01ab30d14743a5ce3422bbe8246", - "reference": "2384711daffaf01ab30d14743a5ce3422bbe8246", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/c43171895161c8eb342bc5fc5eb21760dd91b646", + "reference": "c43171895161c8eb342bc5fc5eb21760dd91b646", "shasum": "" }, "require": { @@ -5736,7 +5736,7 @@ ], "support": { "issues": "https://github.com/nelmio/NelmioApiDocBundle/issues", - "source": "https://github.com/nelmio/NelmioApiDocBundle/tree/v4.33.3" + "source": "https://github.com/nelmio/NelmioApiDocBundle/tree/v4.33.4" }, "funding": [ { @@ -5744,7 +5744,7 @@ "type": "github" } ], - "time": "2024-11-07T15:46:45+00:00" + "time": "2024-11-08T15:00:51+00:00" }, { "name": "nelmio/cors-bundle", @@ -7014,23 +7014,23 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.18" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -7066,9 +7066,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-11-03T20:11:34+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpseclib/phpseclib", From 228c5d20aa1819e7816d775f74238c3c568000b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 04:01:32 +0000 Subject: [PATCH 03/22] Bump postcss from 8.4.47 to 8.4.48 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.47 to 8.4.48. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.47...8.4.48) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 03e6ce6ab..955305fb7 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "file-loader": "^6.2.0", "lato-font": "^3.0.0", "mini-css-extract-plugin": "^2.9.2", - "postcss": "^8.4.47", + "postcss": "^8.4.48", "postcss-loader": "^8.1.1", "postcss-scss": "^4.0.9", "sass-embedded": "^1.80.6", diff --git a/yarn.lock b/yarn.lock index f593d148d..a02aed07a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4290,10 +4290,10 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" - integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== +picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" @@ -4389,13 +4389,13 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.4.28, postcss@^8.4.33, postcss@^8.4.47: - version "8.4.47" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365" - integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ== +postcss@^8.4.28, postcss@^8.4.33, postcss@^8.4.48: + version "8.4.48" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.48.tgz#765f3f8abaa2a2b065cdddbc57ad4cb5a76e515f" + integrity sha512-GCRK8F6+Dl7xYniR5a4FYbpBzU8XnZVeowqsQFYdcXuSbChgiks7qybSkbvnaeqv0G0B+dd9/jJgH8kkLDQeEA== dependencies: nanoid "^3.3.7" - picocolors "^1.1.0" + picocolors "^1.1.1" source-map-js "^1.2.1" prelude-ls@^1.2.1: From f449523940cb5d89cea0e54e970e04aee71afe85 Mon Sep 17 00:00:00 2001 From: "Vladyslav V. Prodan" Date: Mon, 11 Nov 2024 15:46:38 +0000 Subject: [PATCH 04/22] Translated using Weblate (Ukrainian) Currently translated at 100.0% (35 of 35 strings) --- translations/CraueConfigBundle.uk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/CraueConfigBundle.uk.yml b/translations/CraueConfigBundle.uk.yml index 4b8ac709f..befd02322 100644 --- a/translations/CraueConfigBundle.uk.yml +++ b/translations/CraueConfigBundle.uk.yml @@ -32,3 +32,4 @@ restricted_access: Увімкнути аутентифікацію для сай api_user_registration: Дозволити користувачам реєструватись через API store_article_headers: Увімкнути зберігання HTTP-заголовків для кожної статті shaarli_share_origin_url: Увімкнути можливість ділитись оригінальним лінком в Shaarli, якщо сервіс увімкнено +share_linkding: Увімкнути обмін посиланням From b6346269c07c46ceca8a90918cc9b43df100943b Mon Sep 17 00:00:00 2001 From: "Vladyslav V. Prodan" Date: Mon, 11 Nov 2024 15:51:50 +0000 Subject: [PATCH 05/22] Translated using Weblate (Ukrainian) Currently translated at 100.0% (6 of 6 strings) --- translations/validators.uk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/validators.uk.yml b/translations/validators.uk.yml index 39c3baa9b..4bfea1e97 100644 --- a/translations/validators.uk.yml +++ b/translations/validators.uk.yml @@ -1,6 +1,6 @@ validator: password_must_match: Паролі повинні співпадати. - password_too_short: Довжина пароля повинна бути не менше 8-ми символів. + password_too_short: Ваш пароль повинен бути довжиною принаймні 8 символів. password_wrong_value: Введено неправильний поточний пароль. item_per_page_too_high: Вибрано завелику кількість rss_limit_too_high: Вибрано завелику кількість From 2a382b15c1bc9a7ff346745262d314456c6ad09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 12 Nov 2024 15:21:23 +0100 Subject: [PATCH 06/22] Add Markdown export --- app/config/wallabag.yml | 4 + composer.json | 1 + composer.lock | 93 ++++++++++++++++++++++- migrations/Version20241112193044.php | 24 ++++++ src/Controller/ExportController.php | 4 +- src/Helper/EntriesExport.php | 48 +++++++----- templates/Entry/entries.html.twig | 1 + templates/Entry/entry.html.twig | 1 + tests/Controller/ExportControllerTest.php | 16 ++++ 9 files changed, 170 insertions(+), 22 deletions(-) create mode 100644 migrations/Version20241112193044.php diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 4c26ec8a7..b3c1bd7c7 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -114,6 +114,10 @@ parameters: name: export_xml value: 1 section: export + - + name: export_md + value: 1 + section: export - name: import_with_redis value: 0 diff --git a/composer.json b/composer.json index c6ca1557b..a365bf705 100644 --- a/composer.json +++ b/composer.json @@ -87,6 +87,7 @@ "jms/serializer-bundle": "^5.4", "laminas/laminas-code": "^4.7.1", "lcobucci/jwt": "^4.3", + "league/html-to-markdown": "^5.1", "mgargano/simplehtmldom": "^1.5", "mnapoli/piwik-twig-extension": "^3.0", "monolog/monolog": "^2.9", diff --git a/composer.lock b/composer.lock index 91230d050..f1e058f6e 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": "6407ed5fbd4b0973ed565c2a136d3a81", + "content-hash": "a45ce1bad60f024c66e17b6aca7ad88d", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -5303,6 +5303,95 @@ ], "time": "2023-01-02T13:28:00+00:00" }, + { + "name": "league/html-to-markdown", + "version": "5.1.1", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0b4066eede55c48f38bcee4fb8f0aa85654390fd", + "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "mikehaertl/php-shellcommand": "^1.1.0", + "phpstan/phpstan": "^1.8.8", + "phpunit/phpunit": "^8.5 || ^9.2", + "scrutinizer/ocular": "^1.6", + "unleashedtech/php-coding-standard": "^2.7 || ^3.0", + "vimeo/psalm": "^4.22 || ^5.0" + }, + "bin": [ + "bin/html-to-markdown" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.2-dev" + } + }, + "autoload": { + "psr-4": { + "League\\HTMLToMarkdown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" + } + ], + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", + "keywords": [ + "html", + "markdown" + ], + "support": { + "issues": "https://github.com/thephpleague/html-to-markdown/issues", + "source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.1" + }, + "funding": [ + { + "url": "https://www.colinodell.com/sponsor", + "type": "custom" + }, + { + "url": "https://www.paypal.me/colinpodell/10.00", + "type": "custom" + }, + { + "url": "https://github.com/colinodell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/html-to-markdown", + "type": "tidelift" + } + ], + "time": "2023-07-12T21:21:09+00:00" + }, { "name": "masterminds/html5", "version": "2.9.0", @@ -20034,7 +20123,7 @@ "ext-tokenizer": "*", "ext-xml": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "7.4.29" }, diff --git a/migrations/Version20241112193044.php b/migrations/Version20241112193044.php new file mode 100644 index 000000000..7a3705bc5 --- /dev/null +++ b/migrations/Version20241112193044.php @@ -0,0 +1,24 @@ +addSql('INSERT INTO ' . $this->getTable('internal_setting') . " (name, value, section) VALUES ('export_md', '1', 'export');"); + } + + public function down(Schema $schema): void + { + $this->addSql('DELETE FROM' . $this->getTable('internal_setting') . " WHERE name = 'export_md';"); + } +} diff --git a/src/Controller/ExportController.php b/src/Controller/ExportController.php index e4ddbb1f5..c49a3d2c1 100644 --- a/src/Controller/ExportController.php +++ b/src/Controller/ExportController.php @@ -20,7 +20,7 @@ class ExportController extends AbstractController * Gets one entry content. * * @Route("/export/{id}.{format}", name="export_entry", requirements={ - * "format": "epub|pdf|json|xml|txt|csv", + * "format": "epub|pdf|json|xml|txt|csv|md", * "id": "\d+" * }) * @@ -54,7 +54,7 @@ class ExportController extends AbstractController * Export all entries for current user. * * @Route("/export/{category}.{format}", name="export_entries", requirements={ - * "format": "epub|pdf|json|xml|txt|csv", + * "format": "epub|pdf|json|xml|txt|csv|md", * "category": "all|unread|starred|archive|tag_entries|untagged|search|annotated|same_domain" * }) * diff --git a/src/Helper/EntriesExport.php b/src/Helper/EntriesExport.php index 9b4712632..e05f3af84 100644 --- a/src/Helper/EntriesExport.php +++ b/src/Helper/EntriesExport.php @@ -5,6 +5,7 @@ namespace Wallabag\Helper; use Html2Text\Html2Text; use JMS\Serializer\SerializationContext; use JMS\Serializer\SerializerBuilder; +use League\HTMLToMarkdown\HtmlConverter; use PHPePub\Core\EPub; use PHPePub\Core\Structure\OPF\DublinCore; use Symfony\Component\HttpFoundation\Response; @@ -129,10 +130,8 @@ class EntriesExport /** * Use PHPePub to dump a .epub file. - * - * @return Response */ - private function produceEpub() + private function produceEpub(): Response { $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; \assert($user instanceof User); @@ -249,10 +248,8 @@ class EntriesExport /** * Use TCPDF to dump a .pdf file. - * - * @return Response */ - private function producePdf() + private function producePdf(): Response { $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; \assert($user instanceof User); @@ -326,10 +323,8 @@ class EntriesExport /** * Inspired from CsvFileDumper. - * - * @return Response */ - private function produceCsv() + private function produceCsv(): Response { $delimiter = ';'; $enclosure = '"'; @@ -372,10 +367,8 @@ class EntriesExport /** * Dump a JSON file. - * - * @return Response */ - private function produceJson() + private function produceJson(): Response { return Response::create( $this->prepareSerializingContent('json'), @@ -390,10 +383,8 @@ class EntriesExport /** * Dump a XML file. - * - * @return Response */ - private function produceXml() + private function produceXml(): Response { return Response::create( $this->prepareSerializingContent('xml'), @@ -408,10 +399,8 @@ class EntriesExport /** * Dump a TXT file. - * - * @return Response */ - private function produceTxt() + private function produceTxt(): Response { $content = ''; $bar = str_repeat('=', 100); @@ -432,6 +421,29 @@ class EntriesExport ); } + /** + * Dump a Markdown file. + */ + private function produceMd(): Response + { + $content = ''; + $converter = new HtmlConverter(); + $converter->getConfig()->setOption('strip_tags', true); + foreach ($this->entries as $entry) { + $content .= $converter->convert('

' . $entry->getTitle() . '

' . $entry->getContent()); + } + + return Response::create( + $content, + 200, + [ + 'Content-type' => 'text/markdown', + 'Content-Disposition' => 'attachment; filename="' . $this->getSanitizedFilename() . '.md"', + 'Content-Transfer-Encoding' => 'UTF-8', + ] + ); + } + /** * Return a Serializer object for producing processes that need it (JSON & XML). * diff --git a/templates/Entry/entries.html.twig b/templates/Entry/entries.html.twig index 2e8b8ebce..1dc4f16fd 100644 --- a/templates/Entry/entries.html.twig +++ b/templates/Entry/entries.html.twig @@ -105,6 +105,7 @@ {% if craue_setting('export_csv') %}
  • CSV
  • {% endif %} {% if craue_setting('export_txt') %}
  • TXT
  • {% endif %} {% if craue_setting('export_xml') %}
  • XML
  • {% endif %} + {% if craue_setting('export_md') %}
  • Markdown
  • {% endif %} diff --git a/templates/Entry/entry.html.twig b/templates/Entry/entry.html.twig index e5b45a59f..d3714acf6 100644 --- a/templates/Entry/entry.html.twig +++ b/templates/Entry/entry.html.twig @@ -242,6 +242,7 @@ {% if craue_setting('export_json') %}
  • JSON
  • {% endif %} {% if craue_setting('export_txt') %}
  • TXT
  • {% endif %} {% if craue_setting('export_xml') %}
  • XML
  • {% endif %} + {% if craue_setting('export_md') %}
  • Markdown
  • {% endif %} diff --git a/tests/Controller/ExportControllerTest.php b/tests/Controller/ExportControllerTest.php index ffe2aa42a..bb8e6995f 100644 --- a/tests/Controller/ExportControllerTest.php +++ b/tests/Controller/ExportControllerTest.php @@ -307,6 +307,22 @@ class ExportControllerTest extends WallabagTestCase $this->assertNotEmpty('updated_at', (string) $content->entry[0]->updated_at); } + public function testMdExport() + { + $this->logInAs('admin'); + $client = $this->getTestClient(); + $client->request('GET', '/export/all.md'); + + $this->assertSame(200, $client->getResponse()->getStatusCode()); + + $headers = $client->getResponse()->headers; + $content = $client->getResponse()->getContent(); + $this->assertSame('text/markdown; charset=UTF-8', $headers->get('content-type')); + $this->assertSame('attachment; filename="All articles.md"', $headers->get('content-disposition')); + $this->assertSame('UTF-8', $headers->get('content-transfer-encoding')); + $this->assertStringContainsString('=================', $content); + } + public function testJsonExportFromSameDomain() { $this->logInAs('admin'); From 24b612e6f845b56033f50647d43c79ea47c0c08b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 03:22:53 +0000 Subject: [PATCH 07/22] Bump doctrine/doctrine-fixtures-bundle from 3.6.1 to 3.6.2 Bumps [doctrine/doctrine-fixtures-bundle](https://github.com/doctrine/DoctrineFixturesBundle) from 3.6.1 to 3.6.2. - [Release notes](https://github.com/doctrine/DoctrineFixturesBundle/releases) - [Commits](https://github.com/doctrine/DoctrineFixturesBundle/compare/3.6.1...3.6.2) --- updated-dependencies: - dependency-name: doctrine/doctrine-fixtures-bundle dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 140 ++++++++++++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 73 deletions(-) diff --git a/composer.lock b/composer.lock index f1e058f6e..c57017a08 100644 --- a/composer.lock +++ b/composer.lock @@ -860,16 +860,16 @@ }, { "name": "doctrine/dbal", - "version": "3.9.0", + "version": "3.9.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "d8f68ea6cc00912e5313237130b8c8decf4d28c6" + "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/d8f68ea6cc00912e5313237130b8c8decf4d28c6", - "reference": "d8f68ea6cc00912e5313237130b8c8decf4d28c6", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/61446f07fcb522414d6cfd8b1c3e5f9e18c579ba", + "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba", "shasum": "" }, "require": { @@ -885,7 +885,7 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "1.11.7", + "phpstan/phpstan": "1.12.6", "phpstan/phpstan-strict-rules": "^1.6", "phpunit/phpunit": "9.6.20", "psalm/plugin-phpunit": "0.18.4", @@ -953,7 +953,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.9.0" + "source": "https://github.com/doctrine/dbal/tree/3.9.3" }, "funding": [ { @@ -969,7 +969,7 @@ "type": "tidelift" } ], - "time": "2024-08-15T07:34:42+00:00" + "time": "2024-10-10T17:56:43+00:00" }, { "name": "doctrine/deprecations", @@ -1665,16 +1665,16 @@ }, { "name": "doctrine/orm", - "version": "2.19.6", + "version": "2.20.0", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "c1bb2ccf4b19c845f91ff7c4c01dc7cbba7f4073" + "reference": "8ed6c2234aba019f9737a6bcc9516438e62da27c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/c1bb2ccf4b19c845f91ff7c4c01dc7cbba7f4073", - "reference": "c1bb2ccf4b19c845f91ff7c4c01dc7cbba7f4073", + "url": "https://api.github.com/repos/doctrine/orm/zipball/8ed6c2234aba019f9737a6bcc9516438e62da27c", + "reference": "8ed6c2234aba019f9737a6bcc9516438e62da27c", "shasum": "" }, "require": { @@ -1703,7 +1703,9 @@ "doctrine/annotations": "^1.13 || ^2", "doctrine/coding-standard": "^9.0.2 || ^12.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.11.1", + "phpstan/extension-installer": "~1.1.0 || ^1.4", + "phpstan/phpstan": "~1.4.10 || 1.12.6", + "phpstan/phpstan-deprecation-rules": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psr/log": "^1 || ^2 || ^3", "squizlabs/php_codesniffer": "3.7.2", @@ -1760,9 +1762,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.19.6" + "source": "https://github.com/doctrine/orm/tree/2.20.0" }, - "time": "2024-06-26T17:24:40+00:00" + "time": "2024-10-11T11:47:24+00:00" }, { "name": "doctrine/persistence", @@ -9533,16 +9535,16 @@ }, { "name": "symfony/console", - "version": "v5.4.46", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "fb0d4760e7147d81ab4d9e2d57d56268261b4e4e" + "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/fb0d4760e7147d81ab4d9e2d57d56268261b4e4e", - "reference": "fb0d4760e7147d81ab4d9e2d57d56268261b4e4e", + "url": "https://api.github.com/repos/symfony/console/zipball/c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed", + "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed", "shasum": "" }, "require": { @@ -9612,7 +9614,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.46" + "source": "https://github.com/symfony/console/tree/v5.4.47" }, "funding": [ { @@ -9628,7 +9630,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T14:17:06+00:00" + "time": "2024-11-06T11:30:55+00:00" }, { "name": "symfony/dependency-injection", @@ -9788,16 +9790,16 @@ }, { "name": "symfony/doctrine-bridge", - "version": "v5.4.42", + "version": "v5.4.46", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "009d870d520f30a213a1db0e410f8edf674eda5a" + "reference": "22f9d7c3724ae10656797f10d1cb926daa612845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/009d870d520f30a213a1db0e410f8edf674eda5a", - "reference": "009d870d520f30a213a1db0e410f8edf674eda5a", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/22f9d7c3724ae10656797f10d1cb926daa612845", + "reference": "22f9d7c3724ae10656797f10d1cb926daa612845", "shasum": "" }, "require": { @@ -9884,7 +9886,7 @@ "description": "Provides integration for Doctrine with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/doctrine-bridge/tree/v5.4.42" + "source": "https://github.com/symfony/doctrine-bridge/tree/v5.4.46" }, "funding": [ { @@ -9900,7 +9902,7 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:05:19+00:00" + "time": "2024-11-05T15:58:15+00:00" }, { "name": "symfony/dom-crawler", @@ -10971,16 +10973,16 @@ }, { "name": "symfony/http-kernel", - "version": "v5.4.46", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "492ce57430d44e28b30b2c76724bef31dcb73b3e" + "reference": "0ac42d5e16317f15dc5f8ea83742c51d2ed2350f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/492ce57430d44e28b30b2c76724bef31dcb73b3e", - "reference": "492ce57430d44e28b30b2c76724bef31dcb73b3e", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/0ac42d5e16317f15dc5f8ea83742c51d2ed2350f", + "reference": "0ac42d5e16317f15dc5f8ea83742c51d2ed2350f", "shasum": "" }, "require": { @@ -11064,7 +11066,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.46" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.47" }, "funding": [ { @@ -11080,7 +11082,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:26:57+00:00" + "time": "2024-11-13T13:47:53+00:00" }, { "name": "symfony/intl", @@ -12129,36 +12131,28 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "10112722600777e02d2745716b70c5db4ca70442" + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442", - "reference": "10112722600777e02d2745716b70c5db4ca70442", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, - "type": "library", + "type": "metapackage", "extra": { "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -12182,7 +12176,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0" }, "funding": [ { @@ -12198,7 +12192,7 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", @@ -13524,16 +13518,16 @@ }, { "name": "symfony/string", - "version": "v5.4.45", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7f6807add88b1e2635f3c6de5e1ace631ed7cad2" + "reference": "136ca7d72f72b599f2631aca474a4f8e26719799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7f6807add88b1e2635f3c6de5e1ace631ed7cad2", - "reference": "7f6807add88b1e2635f3c6de5e1ace631ed7cad2", + "url": "https://api.github.com/repos/symfony/string/zipball/136ca7d72f72b599f2631aca474a4f8e26719799", + "reference": "136ca7d72f72b599f2631aca474a4f8e26719799", "shasum": "" }, "require": { @@ -13590,7 +13584,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.45" + "source": "https://github.com/symfony/string/tree/v5.4.47" }, "funding": [ { @@ -13606,7 +13600,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:11:13+00:00" + "time": "2024-11-10T20:33:58+00:00" }, { "name": "symfony/templating", @@ -14177,16 +14171,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.46", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "f51f11e4fc5ca24fa0defcdf4df027078950b9e0" + "reference": "e13e8dfa8eaab2b0536ef365beddc2af723a9ac0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f51f11e4fc5ca24fa0defcdf4df027078950b9e0", - "reference": "f51f11e4fc5ca24fa0defcdf4df027078950b9e0", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e13e8dfa8eaab2b0536ef365beddc2af723a9ac0", + "reference": "e13e8dfa8eaab2b0536ef365beddc2af723a9ac0", "shasum": "" }, "require": { @@ -14246,7 +14240,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.46" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.47" }, "funding": [ { @@ -14262,7 +14256,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T14:17:06+00:00" + "time": "2024-11-08T15:21:10+00:00" }, { "name": "symfony/var-exporter", @@ -15992,16 +15986,16 @@ }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.6.1", + "version": "3.6.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "d13a08ebf244f74c8adb8ff15aa55d01c404e534" + "reference": "f44a224e27573b79140197a44e68484c45fb24da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/d13a08ebf244f74c8adb8ff15aa55d01c404e534", - "reference": "d13a08ebf244f74c8adb8ff15aa55d01c404e534", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/f44a224e27573b79140197a44e68484c45fb24da", + "reference": "f44a224e27573b79140197a44e68484c45fb24da", "shasum": "" }, "require": { @@ -16059,7 +16053,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", - "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.6.1" + "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.6.2" }, "funding": [ { @@ -16075,7 +16069,7 @@ "type": "tidelift" } ], - "time": "2024-05-07T07:16:35+00:00" + "time": "2024-11-13T07:41:29+00:00" }, { "name": "ergebnis/composer-normalize", @@ -19828,16 +19822,16 @@ }, { "name": "symfony/process", - "version": "v5.4.46", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "01906871cb9b5e3cf872863b91aba4ec9767daf4" + "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/01906871cb9b5e3cf872863b91aba4ec9767daf4", - "reference": "01906871cb9b5e3cf872863b91aba4ec9767daf4", + "url": "https://api.github.com/repos/symfony/process/zipball/5d1662fb32ebc94f17ddb8d635454a776066733d", + "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d", "shasum": "" }, "require": { @@ -19870,7 +19864,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.46" + "source": "https://github.com/symfony/process/tree/v5.4.47" }, "funding": [ { @@ -19886,7 +19880,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:18:28+00:00" + "time": "2024-11-06T11:36:42+00:00" }, { "name": "symfony/web-profiler-bundle", @@ -20123,7 +20117,7 @@ "ext-tokenizer": "*", "ext-xml": "*" }, - "platform-dev": {}, + "platform-dev": [], "platform-overrides": { "php": "7.4.29" }, From 0b08fd6d9382338be06bc09e1ffdc59d1bdd8fc3 Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Thu, 14 Nov 2024 07:50:20 +0000 Subject: [PATCH 08/22] Added translation using Weblate (Belarusian) --- translations/CraueConfigBundle.be.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/CraueConfigBundle.be.yml diff --git a/translations/CraueConfigBundle.be.yml b/translations/CraueConfigBundle.be.yml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/translations/CraueConfigBundle.be.yml @@ -0,0 +1 @@ +{} From ba6b040c5ee3b62d311fc32f3af10710313d6601 Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Thu, 14 Nov 2024 07:50:32 +0000 Subject: [PATCH 09/22] Added translation using Weblate (Belarusian) --- translations/messages.be.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/messages.be.yml diff --git a/translations/messages.be.yml b/translations/messages.be.yml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/translations/messages.be.yml @@ -0,0 +1 @@ +{} From 71d1320ce8b411797f79edfefb34464cd09a5aaf Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Thu, 14 Nov 2024 07:50:45 +0000 Subject: [PATCH 10/22] Added translation using Weblate (Belarusian) --- translations/wallabag_user.be.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/wallabag_user.be.yml diff --git a/translations/wallabag_user.be.yml b/translations/wallabag_user.be.yml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/translations/wallabag_user.be.yml @@ -0,0 +1 @@ +{} From fe1b6591e7ce28d2a7e4f17318bfe63b4801e38c Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Thu, 14 Nov 2024 07:51:12 +0000 Subject: [PATCH 11/22] Added translation using Weblate (Belarusian) --- translations/validators.be.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/validators.be.yml diff --git a/translations/validators.be.yml b/translations/validators.be.yml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/translations/validators.be.yml @@ -0,0 +1 @@ +{} From ab9ff3e55ebd7912bb2870d88de45fc0c0e7a948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 3 Nov 2024 09:38:36 +0100 Subject: [PATCH 12/22] Restored lazy connections for RabbitMQ --- .github/workflows/continuous-integration.yml | 54 ++++++++++++++++++++ app/config/services_rabbit.yml | 1 + 2 files changed, 55 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 8f1068312..0a9a88278 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -148,3 +148,57 @@ jobs: - name: "Run PHPUnit" run: "php bin/phpunit -v" + + phpunit-without-rmq-redis: + name: "PHP ${{ matrix.php }} using ${{ matrix.database }} without Rabbit & Redis" + runs-on: "ubuntu-20.04" + + strategy: + fail-fast: false + matrix: + php: + - "8.3" + database: + - "sqlite" + - "mysql" + - "pgsql" + + steps: + - name: "Checkout" + uses: "actions/checkout@v4" + with: + fetch-depth: 2 + + - name: "Install PHP" + uses: "shivammathur/setup-php@v2" + with: + php-version: "${{ matrix.php }}" + coverage: none + tools: pecl + extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy + ini-values: "date.timezone=Europe/Paris" + + - name: "Setup MySQL" + if: "${{ matrix.database == 'mysql' }}" + run: | + sudo systemctl start mysql.service + sudo mysql -u root -proot -h 127.0.0.1 -e "CREATE DATABASE wallabag_test" + + - name: "Setup PostgreSQL" + if: "${{ matrix.database == 'pgsql' }}" + run: | + sudo systemctl start postgresql + sudo -u postgres psql -d template1 -c "CREATE USER wallabag WITH PASSWORD 'wallabagrocks' CREATEDB" + createdb -h localhost -p 5432 -U wallabag wallabag_test + pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag + + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v3" + with: + composer-options: "--optimize-autoloader --prefer-dist" + + - name: "Prepare database configuration" + run: cp app/config/tests/parameters_test.${{ matrix.database }}.yml app/config/parameters_test.yml + + - name: "Run PHPUnit" + run: "php bin/phpunit -v" diff --git a/app/config/services_rabbit.yml b/app/config/services_rabbit.yml index 2c01be3bb..e39ad8972 100644 --- a/app/config/services_rabbit.yml +++ b/app/config/services_rabbit.yml @@ -6,6 +6,7 @@ services: public: true Wallabag\Consumer\RabbitMQConsumerTotalProxy: + lazy: true arguments: $pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer' $readabilityConsumer: '@old_sound_rabbit_mq.import_readability_consumer' From 9252ea55f2af8a1f6950ce86cf3ea00ffde569f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 14 Nov 2024 15:43:23 +0100 Subject: [PATCH 13/22] Improved import page --- templates/Import/index.html.twig | 19 ++++++++++++------- .../Import/ImportControllerTest.php | 3 +-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/templates/Import/index.html.twig b/templates/Import/index.html.twig index 5816c297b..236a7f887 100644 --- a/templates/Import/index.html.twig +++ b/templates/Import/index.html.twig @@ -15,15 +15,20 @@ {% include 'Import/_information.html.twig' %} {{ 'import.page_description'|trans }} - + diff --git a/tests/Controller/Import/ImportControllerTest.php b/tests/Controller/Import/ImportControllerTest.php index f2cadb421..3fc131c87 100644 --- a/tests/Controller/Import/ImportControllerTest.php +++ b/tests/Controller/Import/ImportControllerTest.php @@ -22,8 +22,7 @@ class ImportControllerTest extends WallabagTestCase $client = $this->getTestClient(); $crawler = $client->request('GET', '/import/'); - $this->assertSame(200, $client->getResponse()->getStatusCode()); - $this->assertSame(12, $crawler->filter('blockquote')->count()); + $this->assertSame(12, $crawler->filter('.card-title')->count()); } } From 879bd1aa2f061a982a43509566c4852afed49df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 14 Nov 2024 19:08:00 +0100 Subject: [PATCH 14/22] Update Symfony components after 5.4.47 release --- composer.lock | 399 +++++++++++++++++++++++++------------------------- 1 file changed, 199 insertions(+), 200 deletions(-) diff --git a/composer.lock b/composer.lock index c57017a08..4a2483a6d 100644 --- a/composer.lock +++ b/composer.lock @@ -9206,16 +9206,16 @@ }, { "name": "symfony/asset", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", - "reference": "e5aa241b4914257164b39c3c2678b2c41b7671e3" + "reference": "b7a18eaff1d717c321b4f13403413f8815bf9cb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/asset/zipball/e5aa241b4914257164b39c3c2678b2c41b7671e3", - "reference": "e5aa241b4914257164b39c3c2678b2c41b7671e3", + "url": "https://api.github.com/repos/symfony/asset/zipball/b7a18eaff1d717c321b4f13403413f8815bf9cb0", + "reference": "b7a18eaff1d717c321b4f13403413f8815bf9cb0", "shasum": "" }, "require": { @@ -9260,7 +9260,7 @@ "description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/asset/tree/v5.4.40" + "source": "https://github.com/symfony/asset/tree/v5.4.45" }, "funding": [ { @@ -9276,7 +9276,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-10-22T13:05:35+00:00" }, { "name": "symfony/cache", @@ -9906,16 +9906,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "2ad469c3e07fdba677b278d0e266071a51aa0dac" + "reference": "89647a57db280f9f93c27271fea58babb77bb473" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2ad469c3e07fdba677b278d0e266071a51aa0dac", - "reference": "2ad469c3e07fdba677b278d0e266071a51aa0dac", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/89647a57db280f9f93c27271fea58babb77bb473", + "reference": "89647a57db280f9f93c27271fea58babb77bb473", "shasum": "" }, "require": { @@ -9961,7 +9961,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.40" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.45" }, "funding": [ { @@ -9977,7 +9977,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-10-22T13:05:35+00:00" }, { "name": "symfony/error-handler", @@ -10409,16 +10409,16 @@ }, { "name": "symfony/form", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "ff45013def0a3a692e84010095e8ee5fe9a9fa43" + "reference": "c1974a723cdee8a273cb49ce13fada5c1667706a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/ff45013def0a3a692e84010095e8ee5fe9a9fa43", - "reference": "ff45013def0a3a692e84010095e8ee5fe9a9fa43", + "url": "https://api.github.com/repos/symfony/form/zipball/c1974a723cdee8a273cb49ce13fada5c1667706a", + "reference": "c1974a723cdee8a273cb49ce13fada5c1667706a", "shasum": "" }, "require": { @@ -10491,7 +10491,7 @@ "description": "Allows to easily create, process and reuse HTML forms", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/form/tree/v5.4.40" + "source": "https://github.com/symfony/form/tree/v5.4.45" }, "funding": [ { @@ -10507,7 +10507,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-10-08T07:27:17+00:00" }, { "name": "symfony/framework-bundle", @@ -10662,16 +10662,16 @@ }, { "name": "symfony/google-mailer", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/google-mailer.git", - "reference": "beca9c52ec192b32accf5ec0bcddb8cd29c81a9e" + "reference": "d49cb1463a6e9f45a2f1fd901ede8869d142f76d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/google-mailer/zipball/beca9c52ec192b32accf5ec0bcddb8cd29c81a9e", - "reference": "beca9c52ec192b32accf5ec0bcddb8cd29c81a9e", + "url": "https://api.github.com/repos/symfony/google-mailer/zipball/d49cb1463a6e9f45a2f1fd901ede8869d142f76d", + "reference": "d49cb1463a6e9f45a2f1fd901ede8869d142f76d", "shasum": "" }, "require": { @@ -10708,7 +10708,7 @@ "description": "Symfony Google Mailer Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/google-mailer/tree/v5.4.40" + "source": "https://github.com/symfony/google-mailer/tree/v5.4.45" }, "funding": [ { @@ -10724,20 +10724,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/http-client", - "version": "v5.4.41", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "87ca825717928d178de8a3458f163100925fb675" + "reference": "3b643b83f87e1765d2e9b1e946bb56ee0b4b7bde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/87ca825717928d178de8a3458f163100925fb675", - "reference": "87ca825717928d178de8a3458f163100925fb675", + "url": "https://api.github.com/repos/symfony/http-client/zipball/3b643b83f87e1765d2e9b1e946bb56ee0b4b7bde", + "reference": "3b643b83f87e1765d2e9b1e946bb56ee0b4b7bde", "shasum": "" }, "require": { @@ -10799,7 +10799,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v5.4.41" + "source": "https://github.com/symfony/http-client/tree/v5.4.47" }, "funding": [ { @@ -10815,7 +10815,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T07:25:22+00:00" + "time": "2024-11-13T12:18:12+00:00" }, { "name": "symfony/http-client-contracts", @@ -11086,16 +11086,16 @@ }, { "name": "symfony/intl", - "version": "v5.4.40", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "75482b3b0aadc7f652d99b4f543b1d21f6562ff4" + "reference": "5258476a3ab680cd633a1d23130fcc9e8027e3ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/75482b3b0aadc7f652d99b4f543b1d21f6562ff4", - "reference": "75482b3b0aadc7f652d99b4f543b1d21f6562ff4", + "url": "https://api.github.com/repos/symfony/intl/zipball/5258476a3ab680cd633a1d23130fcc9e8027e3ff", + "reference": "5258476a3ab680cd633a1d23130fcc9e8027e3ff", "shasum": "" }, "require": { @@ -11156,7 +11156,7 @@ "localization" ], "support": { - "source": "https://github.com/symfony/intl/tree/v5.4.40" + "source": "https://github.com/symfony/intl/tree/v5.4.47" }, "funding": [ { @@ -11172,20 +11172,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-11-08T08:12:23+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.41", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "13f4fac7f8450381122f0f4cd750a63c2821c7fa" + "reference": "f732e1fafdf0f4a2d865e91f1018aaca174aeed9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/13f4fac7f8450381122f0f4cd750a63c2821c7fa", - "reference": "13f4fac7f8450381122f0f4cd750a63c2821c7fa", + "url": "https://api.github.com/repos/symfony/mailer/zipball/f732e1fafdf0f4a2d865e91f1018aaca174aeed9", + "reference": "f732e1fafdf0f4a2d865e91f1018aaca174aeed9", "shasum": "" }, "require": { @@ -11232,7 +11232,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.41" + "source": "https://github.com/symfony/mailer/tree/v5.4.45" }, "funding": [ { @@ -11248,20 +11248,20 @@ "type": "tidelift" } ], - "time": "2024-06-27T20:38:52+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/mime", - "version": "v5.4.41", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "c71c7a1aeed60b22d05e738197e31daf2120bd42" + "reference": "8c1b9b3e5b52981551fc6044539af1d974e39064" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/c71c7a1aeed60b22d05e738197e31daf2120bd42", - "reference": "c71c7a1aeed60b22d05e738197e31daf2120bd42", + "url": "https://api.github.com/repos/symfony/mime/zipball/8c1b9b3e5b52981551fc6044539af1d974e39064", + "reference": "8c1b9b3e5b52981551fc6044539af1d974e39064", "shasum": "" }, "require": { @@ -11317,7 +11317,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.41" + "source": "https://github.com/symfony/mime/tree/v5.4.45" }, "funding": [ { @@ -11333,20 +11333,20 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:36:24+00:00" + "time": "2024-10-23T20:18:32+00:00" }, { "name": "symfony/monolog-bridge", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bridge.git", - "reference": "ac6e0bf2a275e017c1dedd54dd0f1fbf252a9351" + "reference": "cf7d75d4d64a41fbb1c0e92301bec404134fa84b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/ac6e0bf2a275e017c1dedd54dd0f1fbf252a9351", - "reference": "ac6e0bf2a275e017c1dedd54dd0f1fbf252a9351", + "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/cf7d75d4d64a41fbb1c0e92301bec404134fa84b", + "reference": "cf7d75d4d64a41fbb1c0e92301bec404134fa84b", "shasum": "" }, "require": { @@ -11401,7 +11401,7 @@ "description": "Provides integration for Monolog with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/monolog-bridge/tree/v5.4.40" + "source": "https://github.com/symfony/monolog-bridge/tree/v5.4.45" }, "funding": [ { @@ -11417,7 +11417,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-10-10T06:37:45+00:00" }, { "name": "symfony/monolog-bundle", @@ -11571,16 +11571,16 @@ }, { "name": "symfony/password-hasher", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/password-hasher.git", - "reference": "21b98178ab2024e6c7d8ab72cca9ba16015c6093" + "reference": "6c5993b24505f98b90ca4896448012bbec54c7c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/password-hasher/zipball/21b98178ab2024e6c7d8ab72cca9ba16015c6093", - "reference": "21b98178ab2024e6c7d8ab72cca9ba16015c6093", + "url": "https://api.github.com/repos/symfony/password-hasher/zipball/6c5993b24505f98b90ca4896448012bbec54c7c8", + "reference": "6c5993b24505f98b90ca4896448012bbec54c7c8", "shasum": "" }, "require": { @@ -11625,7 +11625,7 @@ "password" ], "support": { - "source": "https://github.com/symfony/password-hasher/tree/v5.4.40" + "source": "https://github.com/symfony/password-hasher/tree/v5.4.45" }, "funding": [ { @@ -11641,7 +11641,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/polyfill-ctype", @@ -11802,20 +11802,20 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "e76343c631b453088e2260ac41dfebe21954de81" + "reference": "d80a05e9904d2c2b9b95929f3e4b5d3a8f418d78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/e76343c631b453088e2260ac41dfebe21954de81", - "reference": "e76343c631b453088e2260ac41dfebe21954de81", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/d80a05e9904d2c2b9b95929f3e4b5d3a8f418d78", + "reference": "d80a05e9904d2c2b9b95929f3e4b5d3a8f418d78", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance and support of other locales than \"en\"" @@ -11866,7 +11866,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.31.0" }, "funding": [ { @@ -11882,26 +11882,25 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -11950,7 +11949,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -11966,7 +11965,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -12428,16 +12427,16 @@ }, { "name": "symfony/property-access", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "6e4834145c2231b34eafabe440aaac478a95b456" + "reference": "111e7ed617509f1a9139686055d234aad6e388e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/6e4834145c2231b34eafabe440aaac478a95b456", - "reference": "6e4834145c2231b34eafabe440aaac478a95b456", + "url": "https://api.github.com/repos/symfony/property-access/zipball/111e7ed617509f1a9139686055d234aad6e388e0", + "reference": "111e7ed617509f1a9139686055d234aad6e388e0", "shasum": "" }, "require": { @@ -12489,7 +12488,7 @@ "reflection" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v5.4.40" + "source": "https://github.com/symfony/property-access/tree/v5.4.45" }, "funding": [ { @@ -12505,20 +12504,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/property-info", - "version": "v5.4.45", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "cec75362b20263758c9c7af4c2f9af82614195ae" + "reference": "4d77ab22c57ef56a943e3f5769b5fe66be546094" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/cec75362b20263758c9c7af4c2f9af82614195ae", - "reference": "cec75362b20263758c9c7af4c2f9af82614195ae", + "url": "https://api.github.com/repos/symfony/property-info/zipball/4d77ab22c57ef56a943e3f5769b5fe66be546094", + "reference": "4d77ab22c57ef56a943e3f5769b5fe66be546094", "shasum": "" }, "require": { @@ -12535,7 +12534,7 @@ "require-dev": { "doctrine/annotations": "^1.10.4|^2", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "phpstan/phpdoc-parser": "^1.0", + "phpstan/phpdoc-parser": "^1.0|^2.0", "symfony/cache": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/serializer": "^4.4|^5.0|^6.0" @@ -12580,7 +12579,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v5.4.45" + "source": "https://github.com/symfony/property-info/tree/v5.4.47" }, "funding": [ { @@ -12596,20 +12595,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:11:13+00:00" + "time": "2024-11-07T14:13:13+00:00" }, { "name": "symfony/proxy-manager-bridge", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "2ebc25e0174a6a244f7edada5a498f9728dc0d29" + "reference": "e96cd37f3de0b75ff32f6b79c180ba77c4037eec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/2ebc25e0174a6a244f7edada5a498f9728dc0d29", - "reference": "2ebc25e0174a6a244f7edada5a498f9728dc0d29", + "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/e96cd37f3de0b75ff32f6b79c180ba77c4037eec", + "reference": "e96cd37f3de0b75ff32f6b79c180ba77c4037eec", "shasum": "" }, "require": { @@ -12647,7 +12646,7 @@ "description": "Provides integration for ProxyManager with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/proxy-manager-bridge/tree/v5.4.40" + "source": "https://github.com/symfony/proxy-manager-bridge/tree/v5.4.45" }, "funding": [ { @@ -12663,7 +12662,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -12846,23 +12845,23 @@ }, { "name": "symfony/security-bundle", - "version": "v5.4.41", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/security-bundle.git", - "reference": "86557f237fb152412048912660895ab86aa61494" + "reference": "d6081d1b9118f944df90bb77444a8617eba01542" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/86557f237fb152412048912660895ab86aa61494", - "reference": "86557f237fb152412048912660895ab86aa61494", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/d6081d1b9118f944df90bb77444a8617eba01542", + "reference": "d6081d1b9118f944df90bb77444a8617eba01542", "shasum": "" }, "require": { "ext-xml": "*", "php": ">=7.2.5", "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^5.3|^6.0", + "symfony/dependency-injection": "^5.4.43|^6.4.11", "symfony/deprecation-contracts": "^2.1|^3", "symfony/event-dispatcher": "^5.1|^6.0", "symfony/http-foundation": "^5.3|^6.0", @@ -12929,7 +12928,7 @@ "description": "Provides a tight integration of the Security component into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-bundle/tree/v5.4.41" + "source": "https://github.com/symfony/security-bundle/tree/v5.4.45" }, "funding": [ { @@ -12945,20 +12944,20 @@ "type": "tidelift" } ], - "time": "2024-06-21T13:58:36+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/security-core", - "version": "v5.4.42", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "3c6b81c68a828958ae0bcec9dd44a8e6ea0a38de" + "reference": "2d324971f4a241cf538502e14f15ad32f2b16b9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/3c6b81c68a828958ae0bcec9dd44a8e6ea0a38de", - "reference": "3c6b81c68a828958ae0bcec9dd44a8e6ea0a38de", + "url": "https://api.github.com/repos/symfony/security-core/zipball/2d324971f4a241cf538502e14f15ad32f2b16b9b", + "reference": "2d324971f4a241cf538502e14f15ad32f2b16b9b", "shasum": "" }, "require": { @@ -13023,7 +13022,7 @@ "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-core/tree/v5.4.42" + "source": "https://github.com/symfony/security-core/tree/v5.4.45" }, "funding": [ { @@ -13039,20 +13038,20 @@ "type": "tidelift" } ], - "time": "2024-07-16T19:38:31+00:00" + "time": "2024-10-23T08:30:13+00:00" }, { "name": "symfony/security-csrf", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/security-csrf.git", - "reference": "9058d522c1c33d7ba13f4b3c79555cc2c4c16028" + "reference": "28dcafc3220f12264bb2aabe2389a2163458c1f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-csrf/zipball/9058d522c1c33d7ba13f4b3c79555cc2c4c16028", - "reference": "9058d522c1c33d7ba13f4b3c79555cc2c4c16028", + "url": "https://api.github.com/repos/symfony/security-csrf/zipball/28dcafc3220f12264bb2aabe2389a2163458c1f4", + "reference": "28dcafc3220f12264bb2aabe2389a2163458c1f4", "shasum": "" }, "require": { @@ -13096,7 +13095,7 @@ "description": "Symfony Security Component - CSRF Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-csrf/tree/v5.4.40" + "source": "https://github.com/symfony/security-csrf/tree/v5.4.45" }, "funding": [ { @@ -13112,20 +13111,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/security-guard", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/security-guard.git", - "reference": "d930fd327c290f451c9d8dd7889169195d4484e9" + "reference": "f3da3dbec38aaedaf287ffeb4e3a90994af37faa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-guard/zipball/d930fd327c290f451c9d8dd7889169195d4484e9", - "reference": "d930fd327c290f451c9d8dd7889169195d4484e9", + "url": "https://api.github.com/repos/symfony/security-guard/zipball/f3da3dbec38aaedaf287ffeb4e3a90994af37faa", + "reference": "f3da3dbec38aaedaf287ffeb4e3a90994af37faa", "shasum": "" }, "require": { @@ -13164,7 +13163,7 @@ "description": "Symfony Security Component - Guard", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-guard/tree/v5.4.40" + "source": "https://github.com/symfony/security-guard/tree/v5.4.45" }, "funding": [ { @@ -13180,20 +13179,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/security-http", - "version": "v5.4.41", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/security-http.git", - "reference": "14d271e304dce13ae77e39e6a6353c986e756b40" + "reference": "cde02b002e0447075430e6a84482e38f2fd9268d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-http/zipball/14d271e304dce13ae77e39e6a6353c986e756b40", - "reference": "14d271e304dce13ae77e39e6a6353c986e756b40", + "url": "https://api.github.com/repos/symfony/security-http/zipball/cde02b002e0447075430e6a84482e38f2fd9268d", + "reference": "cde02b002e0447075430e6a84482e38f2fd9268d", "shasum": "" }, "require": { @@ -13250,7 +13249,7 @@ "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-http/tree/v5.4.41" + "source": "https://github.com/symfony/security-http/tree/v5.4.47" }, "funding": [ { @@ -13266,20 +13265,20 @@ "type": "tidelift" } ], - "time": "2024-06-17T05:58:45+00:00" + "time": "2024-11-07T14:12:41+00:00" }, { "name": "symfony/serializer", - "version": "v5.4.41", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "c97dba58c2fb36dee0381da84952cad21c49b6fb" + "reference": "460c5df9fb6c39d10d5b7f386e4feae4b6370221" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/c97dba58c2fb36dee0381da84952cad21c49b6fb", - "reference": "c97dba58c2fb36dee0381da84952cad21c49b6fb", + "url": "https://api.github.com/repos/symfony/serializer/zipball/460c5df9fb6c39d10d5b7f386e4feae4b6370221", + "reference": "460c5df9fb6c39d10d5b7f386e4feae4b6370221", "shasum": "" }, "require": { @@ -13353,7 +13352,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.41" + "source": "https://github.com/symfony/serializer/tree/v5.4.45" }, "funding": [ { @@ -13369,7 +13368,7 @@ "type": "tidelift" } ], - "time": "2024-06-27T16:09:31+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/service-contracts", @@ -13456,16 +13455,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625" + "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0e9daf3b7c805c747638b2cc48f1649e594f9625", - "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fb2c199cf302eb207f8c23e7ee174c1c31a5c004", + "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004", "shasum": "" }, "require": { @@ -13498,7 +13497,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.40" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.45" }, "funding": [ { @@ -13514,7 +13513,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/string", @@ -13604,16 +13603,16 @@ }, { "name": "symfony/templating", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/templating.git", - "reference": "9eae6e708a65ea50e2072e99c87b193b24d3f028" + "reference": "e9e46b530d8e202071bc5efcea1a3d3174d68a9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/templating/zipball/9eae6e708a65ea50e2072e99c87b193b24d3f028", - "reference": "9eae6e708a65ea50e2072e99c87b193b24d3f028", + "url": "https://api.github.com/repos/symfony/templating/zipball/e9e46b530d8e202071bc5efcea1a3d3174d68a9b", + "reference": "e9e46b530d8e202071bc5efcea1a3d3174d68a9b", "shasum": "" }, "require": { @@ -13652,7 +13651,7 @@ "description": "Provides all the tools needed to build any kind of template system", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/templating/tree/v5.4.40" + "source": "https://github.com/symfony/templating/tree/v5.4.45" }, "funding": [ { @@ -13668,20 +13667,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-10-22T13:05:35+00:00" }, { "name": "symfony/translation", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "bb51d7f183756d1ac03f50ea47dc5726518cc7e8" + "reference": "98f26acc99341ca4bab345fb14d7b1d7cb825bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/bb51d7f183756d1ac03f50ea47dc5726518cc7e8", - "reference": "bb51d7f183756d1ac03f50ea47dc5726518cc7e8", + "url": "https://api.github.com/repos/symfony/translation/zipball/98f26acc99341ca4bab345fb14d7b1d7cb825bed", + "reference": "98f26acc99341ca4bab345fb14d7b1d7cb825bed", "shasum": "" }, "require": { @@ -13749,7 +13748,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.40" + "source": "https://github.com/symfony/translation/tree/v5.4.45" }, "funding": [ { @@ -13765,7 +13764,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/translation-contracts", @@ -13847,16 +13846,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v5.4.41", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "d7b10dad12c49863c20c7f8e4cc74b9416eefbb9" + "reference": "b3d3738b4be14bf1a4544a6faeed89463fe8b60e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/d7b10dad12c49863c20c7f8e4cc74b9416eefbb9", - "reference": "d7b10dad12c49863c20c7f8e4cc74b9416eefbb9", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/b3d3738b4be14bf1a4544a6faeed89463fe8b60e", + "reference": "b3d3738b4be14bf1a4544a6faeed89463fe8b60e", "shasum": "" }, "require": { @@ -13948,7 +13947,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v5.4.41" + "source": "https://github.com/symfony/twig-bridge/tree/v5.4.45" }, "funding": [ { @@ -13964,20 +13963,20 @@ "type": "tidelift" } ], - "time": "2024-06-09T18:59:35+00:00" + "time": "2024-10-24T15:46:29+00:00" }, { "name": "symfony/twig-bundle", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", - "reference": "997c002735c88b50a6325cca8ecf3d8723902666" + "reference": "e1ca56e1dc7791eb19f0aff71d3d94e6a91cc8f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/997c002735c88b50a6325cca8ecf3d8723902666", - "reference": "997c002735c88b50a6325cca8ecf3d8723902666", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/e1ca56e1dc7791eb19f0aff71d3d94e6a91cc8f9", + "reference": "e1ca56e1dc7791eb19f0aff71d3d94e6a91cc8f9", "shasum": "" }, "require": { @@ -14038,7 +14037,7 @@ "description": "Provides a tight integration of Twig into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bundle/tree/v5.4.40" + "source": "https://github.com/symfony/twig-bundle/tree/v5.4.45" }, "funding": [ { @@ -14054,20 +14053,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/validator", - "version": "v5.4.41", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "e00b2547f712a97755933db45efc03123b2d2690" + "reference": "7caeb2a5f5d5a8a82f243e4dd0b1e7b89e54dc33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/e00b2547f712a97755933db45efc03123b2d2690", - "reference": "e00b2547f712a97755933db45efc03123b2d2690", + "url": "https://api.github.com/repos/symfony/validator/zipball/7caeb2a5f5d5a8a82f243e4dd0b1e7b89e54dc33", + "reference": "7caeb2a5f5d5a8a82f243e4dd0b1e7b89e54dc33", "shasum": "" }, "require": { @@ -14107,7 +14106,7 @@ "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/intl": "^4.4|^5.0|^6.0", "symfony/mime": "^4.4|^5.0|^6.0", - "symfony/property-access": "^4.4|^5.0|^6.0", + "symfony/property-access": "^5.4|^6.0", "symfony/property-info": "^5.3|^6.0", "symfony/translation": "^5.4.35|~6.3.12|^6.4.3", "symfony/yaml": "^4.4|^5.0|^6.0" @@ -14151,7 +14150,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v5.4.41" + "source": "https://github.com/symfony/validator/tree/v5.4.47" }, "funding": [ { @@ -14167,7 +14166,7 @@ "type": "tidelift" } ], - "time": "2024-06-10T09:18:21+00:00" + "time": "2024-11-08T08:12:23+00:00" }, { "name": "symfony/var-dumper", @@ -19432,16 +19431,16 @@ }, { "name": "symfony/browser-kit", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "92c8ba1e5ee12d07120744c90898516132b4e58b" + "reference": "03cce39764429e07fbab9b989a1182a24578341d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/92c8ba1e5ee12d07120744c90898516132b4e58b", - "reference": "92c8ba1e5ee12d07120744c90898516132b4e58b", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/03cce39764429e07fbab9b989a1182a24578341d", + "reference": "03cce39764429e07fbab9b989a1182a24578341d", "shasum": "" }, "require": { @@ -19484,7 +19483,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.4.40" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.45" }, "funding": [ { @@ -19500,20 +19499,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-10-22T13:05:35+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "ea43887e9afd2029509662d4f95e8b5ef6fc9bbb" + "reference": "4f7f3c35fba88146b56d0025d20ace3f3901f097" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/ea43887e9afd2029509662d4f95e8b5ef6fc9bbb", - "reference": "ea43887e9afd2029509662d4f95e8b5ef6fc9bbb", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/4f7f3c35fba88146b56d0025d20ace3f3901f097", + "reference": "4f7f3c35fba88146b56d0025d20ace3f3901f097", "shasum": "" }, "require": { @@ -19550,7 +19549,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.40" + "source": "https://github.com/symfony/css-selector/tree/v5.4.45" }, "funding": [ { @@ -19566,20 +19565,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/debug-bundle", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/debug-bundle.git", - "reference": "177f79296705823eee0d7dd79773f3a9df884fe0" + "reference": "653c7629d036ef24ac5de54a157aecdc400d2570" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/177f79296705823eee0d7dd79773f3a9df884fe0", - "reference": "177f79296705823eee0d7dd79773f3a9df884fe0", + "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/653c7629d036ef24ac5de54a157aecdc400d2570", + "reference": "653c7629d036ef24ac5de54a157aecdc400d2570", "shasum": "" }, "require": { @@ -19629,7 +19628,7 @@ "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug-bundle/tree/v5.4.40" + "source": "https://github.com/symfony/debug-bundle/tree/v5.4.45" }, "funding": [ { @@ -19645,7 +19644,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/maker-bundle", @@ -19740,16 +19739,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v7.1.2", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "8eb63f1c0e2001f97b3cd9ed550b18765cdeb1c8" + "reference": "c6b9d8f52d3e276bedb49612aa4a2a046171287f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/8eb63f1c0e2001f97b3cd9ed550b18765cdeb1c8", - "reference": "8eb63f1c0e2001f97b3cd9ed550b18765cdeb1c8", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c6b9d8f52d3e276bedb49612aa4a2a046171287f", + "reference": "c6b9d8f52d3e276bedb49612aa4a2a046171287f", "shasum": "" }, "require": { @@ -19802,7 +19801,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v7.1.2" + "source": "https://github.com/symfony/phpunit-bridge/tree/v7.1.6" }, "funding": [ { @@ -19818,7 +19817,7 @@ "type": "tidelift" } ], - "time": "2024-06-25T19:55:06+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/process", @@ -19884,16 +19883,16 @@ }, { "name": "symfony/web-profiler-bundle", - "version": "v5.4.40", + "version": "v5.4.46", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "a29669617c4e63785f363571a190a706b9022890" + "reference": "8ce2ad95670ad50b92eb6456836d15d0cc0eeff8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/a29669617c4e63785f363571a190a706b9022890", - "reference": "a29669617c4e63785f363571a190a706b9022890", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/8ce2ad95670ad50b92eb6456836d15d0cc0eeff8", + "reference": "8ce2ad95670ad50b92eb6456836d15d0cc0eeff8", "shasum": "" }, "require": { @@ -19944,7 +19943,7 @@ "description": "Provides a development tool that gives detailed information about the execution of any request", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/web-profiler-bundle/tree/v5.4.40" + "source": "https://github.com/symfony/web-profiler-bundle/tree/v5.4.46" }, "funding": [ { @@ -19960,7 +19959,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-11-04T11:02:15+00:00" }, { "name": "symfony/web-server-bundle", @@ -20117,7 +20116,7 @@ "ext-tokenizer": "*", "ext-xml": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "7.4.29" }, From 238e8f3be09e6888d2eb742e5149bced1766669f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 14 Nov 2024 20:45:33 +0100 Subject: [PATCH 15/22] Fix default support URL --- app/config/wallabag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index b3c1bd7c7..09aeb86b2 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -144,7 +144,7 @@ parameters: section: misc - name: wallabag_support_url - value: https://www.wallabag.org/pages/support.html + value: https://github.com/wallabag/wallabag/issues/new/choose section: misc - name: api_user_registration From fd7d344d2c9cb7d5cf323eac053d6b2436f7e435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carvanavoki?= Date: Thu, 14 Nov 2024 08:09:54 +0000 Subject: [PATCH 16/22] Translated using Weblate (Belarusian) Currently translated at 100.0% (35 of 35 strings) --- translations/CraueConfigBundle.be.yml | 36 ++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/translations/CraueConfigBundle.be.yml b/translations/CraueConfigBundle.be.yml index 0967ef424..9f587b847 100644 --- a/translations/CraueConfigBundle.be.yml +++ b/translations/CraueConfigBundle.be.yml @@ -1 +1,35 @@ -{} +settings_changed: Канфігурацыя абноўлена +download_pictures: Пампаваць карцінкі на ваш сэрвэр +diaspora_url: diaspora* URL, калі сэрвіс уключаны +export_xml: Уключыць экспарт XML +import_with_rabbitmq: Уключыць RabbitMQ для асінхроннага ймпарту даных +shaarli_url: Shaarli URL, калі сэрвіс уключаны +share_shaarli: Уключыць магчымасьць пашырэньня ў Shaarli +share_twitter: Уключыць магчымасьць пашырэньня ў Twitter +share_unmark: Уключыць магчымасьць пашырэньня ў Unmark.it +share_linkding: Уключыць магчымасьць пашырэньня ў Linkding +show_printlink: Адлюстроўваць спасылкі ў вэрсыйі для друку +modify_settings: ужыць +matomo_enabled: Уключыць Matomo +share_public: Дазволіць агульнадаступныя спасылкі для запісаў +restricted_access: Уключыць аўтэнтыфікацыю для платных вэб-сайтаў +shaarli_share_origin_url: Уключыць адпраўку URL-адрасу крыніцы ў Shaarlі, калі сэрвіс ўключаны +export_epub: Уключыць экспарт ePub +export_pdf: Уключыць экспарт PDF +export_json: Уключыць экспарт JSON +export_txt: Уключыць экспарт TXT +import_with_redis: Уключыць Redis для асынхроннага ймпарту даных +export_csv: Уключыць экспарт CSV +unmark_url: Unmark URL, калі сэрвіс уключаны +share_mail: Уключыць магчымасьць пашырэньня праз e-mail +share_diaspora: Уключыць магчымасьць пашырэньня ў diaspora* +wallabag_support_url: Падтрымка URL для wallabag +export: экспарт +matomo_site_id: Ідэнтыфікатар вашага сайта ў Matomo +entry: артыкул +import: імпарт +misc: рознае +matomo_host: Разьмяшчэньне вашага сайта ў Matomo (без http:// альбо https://) +download_images_enabled: Спампоўваць выявы лякальна +api_user_registration: Уключыць рэгістрацыю карыстальніка праз APІ +store_article_headers: Уключыце, калі wallabag захоўвае HTTP загалоўкі для кожнага артыкула From da1cb9316d212f7f8a7ec3f5a8fe757cb6ae8066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carvanavoki?= Date: Thu, 14 Nov 2024 08:41:28 +0000 Subject: [PATCH 17/22] Translated using Weblate (Belarusian) Currently translated at 18.6% (112 of 599 strings) --- translations/messages.be.yml | 138 ++++++++++++++++++++++++++++++++++- 1 file changed, 137 insertions(+), 1 deletion(-) diff --git a/translations/messages.be.yml b/translations/messages.be.yml index 0967ef424..4b1e9f104 100644 --- a/translations/messages.be.yml +++ b/translations/messages.be.yml @@ -1 +1,137 @@ -{} +security: + login: + page_title: Сардэчна запрашаем у wallabag! + keep_logged_in: Захаваць мяне ў сыстэме + forgot_password: Забыліся на пароль? + submit: Увайсьці + register: Зарэгістравацца + cancel: Скасаваць + username: Імя карыстальніка + password: Пароль + register: + page_title: Стварыць уліковы запіс + go_to_account: Перайсьці ва ўліковы запіс + resetting: + description: Увядзіце ніжэй свой адрас электроннай пошты, і мы вышлем вам інструкцыйі па скідзе пароля. +menu: + left: + starred: Пазначаныя + archive: Архіў + with_annotations: З анатацыямі + internal_settings: Унутраныя налады + import: Імпарт + howto: Інструкцыя + developer: Кіраваньне кліентамі API + logout: Выйсьці + about: Аб wallabag + search: Пошук + save_link: Захаваць спасылку + back_to_unread: Вярнуцца да непрачытаных артыкулаў + users_management: Кіраваньне карыстальнікамі + site_credentials: Уліковыя даныя сайта + quickstart: Хуткі старт + theme_toggle_light: Сьветлая тэма + theme_toggle_dark: Цёмная тэма + theme_toggle_auto: Аўтаматычная тэма + config: Канфігурацыя + tags: Тэгі + unread: Непрачытанае + all_articles: Усе запісы + ignore_origin_instance_rules: Ґлябальныя правілы йґнараваньня крыніцы + top: + add_new_entry: Дадаць новы запіс + search: Пошук + filter_entries: Фільтраваць запісы + export: Экспарт + account: Мой уліковы запіс + random_entry: Перайсьці да выпадковага запісу з гэтага сьпісу + search_form: + input_label: Увядзіце шуканае тут +footer: + wallabag: + elsewhere: Вазьміце wallabag з сабой + social: Сац. сеткі + about: Аб wallabag + powered_by: створана з дапамогай + stats: З %user_creation% вы прачыталі %nb_archives% артыкулаў. Гэта прыкладна %per_day% у дзень! +config: + page_title: Канфігурацыя + tab_menu: + settings: Налады + feed: Стужкі + user_info: Інфармацыя аб карыстальніку + password: Пароль + rules: Правілы выстаўленьня тэгаў + new_user: Дадаць карыстальніка + ignore_origin: Іґнараваць правілы крыніцы + reset: Скінуць вобласьць + article_display: Адлюстраваньне артыкула + form_settings: + items_per_page_label: Запісаў на старонцы + reading_speed: + label: Хуткасьць чытаньня + help_message: 'Вы можаце выкарыстоўваць анлайн-інструмэнты для ацэнкі хуткасьці чытаньня:' + 200_word: Я чытаю ~200 словаў у хвіліну + 300_word: Я чытаю ~300 словаў у хвіліну + 400_word: Я чытаю ~400 словаў у хвіліну + 100_word: Я чытаю ~100 словаў у хвіліну + action_mark_as_read: + label: Што рабіць пасьля выдаленьня артыкула, пазначэньня яго зоркай або пазначэньня як прачытанага? + redirect_homepage: Да хатняй старонцы + redirect_current_page: Застацца на бягучай старонцы + pocket_consumer_key_label: Ключ ад Pocket для ймпарту кантэнту + android_configuration: Наладзьце сваю Android аплікацыю + help_items_per_page: Вы можаце зьмяніць колькасьць артыкулаў, якія адлюстроўваюцца на кожнай старонцы. + help_language: Вы можаце зьмяніць мову йнтэрфэйсу wallabag. + help_pocket_consumer_key: Патрабуецца для ймпарту з Pocket. Вы можаце стварыць яго ў сваім уліковым запісе Pocket. + help_display_thumbnails: Вы можаце вырашыць, ці хочаце вы каб мініятуры артыкулаў адлюстроўваліся. Карысна калі ў вас павольнае злучэньне зь сеткай. + help_font: Вы можаце абраць сямейства шрыфтоў, якое хочаце выкарыстоўваць. + help_fontsize: Вы можаце абраць памер шрыфта, які хочаце выкарыстоўваць. + help_lineheight: Вы можаце абраць вышыню лінійі, якую хочаце выкарыстоўваць. + help_maxwidth: Вы можаце абраць максымальную шырыню, якую хочаце выкарыстоўваць. + display_thumbnails_label: Адлюстраваньне мініятур артыкулаў (карысна калі ў вас павольнае злучэньне зь сеткай). + font_label: Сямейства шрыфтоў + fontsize_label: Памер шрыфта + lineheight_label: Вышыня лінійі + maxwidth_label: Максімальная шырыня + language_label: Мова + android_instruction: Націсьніце тут, каб прадусталяваць вашую Android аплікацыю + help_reading_speed: wallabag разьлічвае час чытаньня для кожнага артыкула. Вы можаце вызначыць тут, як хутка вы чытаеце. wallabag пералічыць час чытаньня для кожнага артыкула. + form_feed: + no_token: Няма токена + token_create: Стварыць свой токен + token_reset: Аднавіце свой токен + token_revoke: Адклікаць токен + feed_links: Спасылкі на стужкі + feed_link: + starred: Пазначаныя + archive: Архіваваныя + all: Усе + unread: Непрачытанае + feed_limit: Колькасьць элемэнтаў у стужцы + description: Навінавыя стужкі Atom, якія прадстаўляюцца wallabag, дазваляюць чытаць захаваныя артыкулы пры дапамозе ўпадабанай вамі Atom-чыталкі. Спачатку вам трэба зґенераваць токен. + token_label: Токен стужкі + form_user: + login_label: Лагін (ня можа быць зьменены) + name_label: Імя + email_label: Электронная пошта + two_factor: + googleTwoFactor_label: Выкарыстоўваючы праґраму OTP (адкрыйце праґраму, напрыклад Google Authenticator, Authy альбо FreeOTP, каб атрымаць аднаразовы код) + table_method: Мэтад + table_state: Стан + table_action: Дзеяньне + state_enabled: Уключана + state_disabled: Выключана + action_email: Выкарыстаць электронную пошту + action_app: Выкарыстаць OTP аплікацыю + emailTwoFactor_label: З дапамогай электроннай пошты (атрымаць код па электроннай пошце) + two_factor_description: Уключэньне двухфактарнай аўтэнтыфікацыйі азначае, што вы будзеце атрымліваць электронны ліст з кодам пры кожным новым ненадзейным злучэньні. + delete: + title: Выдаліць мой уліковы запіс (ці небясьпечная зона) + description: Калі вы выдаліце свой уліковы запіс, УСЕ вашыя АРТЫКУЛЫ, тэгі, АНАТАЦЫІ й ВАШ УЛІКОВЫ ЗАПІС будуць ПЕРМАНЕНТНА выдаленыя (ГЭТА НЕЛЬГА АДМЯНІЦЬ). Таксама, потым вы выйдзеце з сыстэмы. + button: Выдаліць мой уліковы запіс + confirm: Вы ўпэўненыя? (ГЭТА НЕЛЬГА АДМЯНІЦЬ) + reset: + title: Зона скіду (ці небясьпечная зона) + form: + save: Захаваць From d0fc5a8823009d18fc6c1edc12779003feecbd01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carvanavoki?= Date: Thu, 14 Nov 2024 07:56:38 +0000 Subject: [PATCH 18/22] Translated using Weblate (Belarusian) Currently translated at 85.7% (6 of 7 strings) --- translations/wallabag_user.be.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/translations/wallabag_user.be.yml b/translations/wallabag_user.be.yml index 0967ef424..5bdfdf3cb 100644 --- a/translations/wallabag_user.be.yml +++ b/translations/wallabag_user.be.yml @@ -1 +1,10 @@ -{} +auth_code: + on: Ўкл + mailer: + subject: код аўнтыфікацыйі wallabag + body: + second_para: 'Вось код:' + support: 'Калі ласка, не саромейцеся зьвяртацца да нас, калі ў вас узьнікнуць праблемы:' + signature: Каманда wallabag + hello: Гэй %user%, + first_para: Паколькі вам патрабуецца двухфактарная аўтэнтыфікацыя для ўваходу ў ваш уліковы запіс wallabag, а новая прылада толькі што выкарыстоўвала яе, мы дасылаем вам код для пацьверджаньня яе злучэньня. From 23672d8f92f7e8b2477265b757b3422cdf321fa7 Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Thu, 14 Nov 2024 14:54:28 +0100 Subject: [PATCH 19/22] Added translation using Weblate (Belarusian (Latin script)) --- translations/CraueConfigBundle.be_Latn.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/CraueConfigBundle.be_Latn.yml diff --git a/translations/CraueConfigBundle.be_Latn.yml b/translations/CraueConfigBundle.be_Latn.yml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/translations/CraueConfigBundle.be_Latn.yml @@ -0,0 +1 @@ +{} From 48be44b58c07364e216d0975761fc54897f3d1d2 Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Thu, 14 Nov 2024 14:54:42 +0100 Subject: [PATCH 20/22] Added translation using Weblate (Belarusian (Latin script)) --- translations/messages.be_Latn.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/messages.be_Latn.yml diff --git a/translations/messages.be_Latn.yml b/translations/messages.be_Latn.yml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/translations/messages.be_Latn.yml @@ -0,0 +1 @@ +{} From 3112b4752fc0235358004b759309e218245d8538 Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Thu, 14 Nov 2024 13:55:05 +0000 Subject: [PATCH 21/22] Added translation using Weblate (Belarusian (Latin script)) --- translations/wallabag_user.be_Latn.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/wallabag_user.be_Latn.yml diff --git a/translations/wallabag_user.be_Latn.yml b/translations/wallabag_user.be_Latn.yml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/translations/wallabag_user.be_Latn.yml @@ -0,0 +1 @@ +{} From 321c73bc9f685174eccd7f5b37468f5d112d2852 Mon Sep 17 00:00:00 2001 From: Languages add-on Date: Thu, 14 Nov 2024 14:55:17 +0100 Subject: [PATCH 22/22] Added translation using Weblate (Belarusian (Latin script)) --- translations/validators.be_Latn.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/validators.be_Latn.yml diff --git a/translations/validators.be_Latn.yml b/translations/validators.be_Latn.yml new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/translations/validators.be_Latn.yml @@ -0,0 +1 @@ +{}