mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-02 13:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.6.0

Browse source
This commit is contained in:
Jeremy Benoist 2022-08-23 08:43:46 +02:00
parent 2f1f6e9c51 b73491e822
commit 131f21883d
No known key found for this signature in database
GPG key ID: 7168D5DD29F38552
15 changed files with 1069 additions and 876 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitattributes vendored Normal file
View file

@ -0,0 +1,7 @@
/.editorconfig export-ignore
/.gitattributes export-ignore
/.github export-ignore
/.gitignore export-ignore
/phpstan.neon export-ignore
/phpunit.xml.dist export-ignore
/tests export-ignore

2
app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
View file

@ -3,7 +3,7 @@ download_pictures: Resimleri sunucuya indir
carrot: Carrot'a paylaşımı etkinleştir carrot: Carrot'a paylaşımı etkinleştir
diaspora_url: hizmet etkinse diaspora* URL'si diaspora_url: hizmet etkinse diaspora* URL'si
export_epub: ePub dışa aktarımını etkinleştir export_epub: ePub dışa aktarımını etkinleştir
export_mobi: .mobi dışa aktarımını etkinleştir export_mobi: .mobi dışa aktarımını etkinleştir (kullanım dışı, yakında kaldırılacak)
export_pdf: PDF dışa aktarımını etkinleştir export_pdf: PDF dışa aktarımını etkinleştir
export_csv: CSV dışa aktarımını etkinleştir export_csv: CSV dışa aktarımını etkinleştir
export_json: JSON dışa aktarımını etkinleştir export_json: JSON dışa aktarımını etkinleştir

281
composer.lock generated
View file

@ -541,16 +541,16 @@
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
"version": "1.13.2", "version": "1.13.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/annotations.git", "url": "https://github.com/doctrine/annotations.git",
"reference": "5b668aef16090008790395c02c893b1ba13f7e08" "reference": "648b0343343565c4a056bfc8392201385e8d89f0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
"reference": "5b668aef16090008790395c02c893b1ba13f7e08", "reference": "648b0343343565c4a056bfc8392201385e8d89f0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -562,9 +562,10 @@
"require-dev": { "require-dev": {
"doctrine/cache": "^1.11 || ^2.0", "doctrine/cache": "^1.11 || ^2.0",
"doctrine/coding-standard": "^6.0 || ^8.1", "doctrine/coding-standard": "^6.0 || ^8.1",
"phpstan/phpstan": "^0.12.20", "phpstan/phpstan": "^1.4.10 || ^1.8.0",
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
"symfony/cache": "^4.4 || ^5.2" "symfony/cache": "^4.4 || ^5.2",
"vimeo/psalm": "^4.10"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -607,9 +608,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/annotations/issues", "issues": "https://github.com/doctrine/annotations/issues",
"source": "https://github.com/doctrine/annotations/tree/1.13.2" "source": "https://github.com/doctrine/annotations/tree/1.13.3"
}, },
"time": "2021-08-05T19:00:23+00:00" "time": "2022-07-02T10:48:51+00:00"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
@ -1993,16 +1994,16 @@
}, },
{ {
"name": "egulias/email-validator", "name": "egulias/email-validator",
"version": "3.2", "version": "3.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/egulias/EmailValidator.git", "url": "https://github.com/egulias/EmailValidator.git",
"reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286" "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a5ed8d58ed0c340a7c2109f587951b1c84cf6286", "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715",
"reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286", "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2049,7 +2050,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/egulias/EmailValidator/issues", "issues": "https://github.com/egulias/EmailValidator/issues",
"source": "https://github.com/egulias/EmailValidator/tree/3.2" "source": "https://github.com/egulias/EmailValidator/tree/3.2.1"
}, },
"funding": [ "funding": [
{ {
@ -2057,7 +2058,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-05-28T22:19:18+00:00" "time": "2022-06-18T20:57:19+00:00"
}, },
{ {
"name": "fig/link-util", "name": "fig/link-util",
@ -3019,16 +3020,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "1.8.5", "version": "1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3049,7 +3050,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7-dev" "dev-master": "1.9-dev"
} }
}, },
"autoload": { "autoload": {
@ -3109,7 +3110,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.5" "source": "https://github.com/guzzle/psr7/tree/1.9.0"
}, },
"funding": [ "funding": [
{ {
@ -3125,7 +3126,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-20T21:51:18+00:00" "time": "2022-06-20T21:43:03+00:00"
}, },
{ {
"name": "guzzlehttp/ringphp", "name": "guzzlehttp/ringphp",
@ -4446,16 +4447,16 @@
}, },
{ {
"name": "j0k3r/graby-site-config", "name": "j0k3r/graby-site-config",
"version": "1.0.153", "version": "1.0.154",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/j0k3r/graby-site-config.git", "url": "https://github.com/j0k3r/graby-site-config.git",
"reference": "eee81c160c0fbb570756f3e4992898057f47e614" "reference": "b6aa77e4da5a90be8ee1426b64f48baeea62247e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/eee81c160c0fbb570756f3e4992898057f47e614", "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/b6aa77e4da5a90be8ee1426b64f48baeea62247e",
"reference": "eee81c160c0fbb570756f3e4992898057f47e614", "reference": "b6aa77e4da5a90be8ee1426b64f48baeea62247e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4484,9 +4485,9 @@
"description": "Graby site config files", "description": "Graby site config files",
"support": { "support": {
"issues": "https://github.com/j0k3r/graby-site-config/issues", "issues": "https://github.com/j0k3r/graby-site-config/issues",
"source": "https://github.com/j0k3r/graby-site-config/tree/1.0.153" "source": "https://github.com/j0k3r/graby-site-config/tree/1.0.154"
}, },
"time": "2022-06-08T04:55:59+00:00" "time": "2022-07-01T02:50:45+00:00"
}, },
{ {
"name": "j0k3r/httplug-ssrf-plugin", "name": "j0k3r/httplug-ssrf-plugin",
@ -4561,16 +4562,16 @@
}, },
{ {
"name": "j0k3r/php-readability", "name": "j0k3r/php-readability",
"version": "1.2.9", "version": "1.2.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/j0k3r/php-readability.git", "url": "https://github.com/j0k3r/php-readability.git",
"reference": "c506b7ebd7afe77cd6e4e24c0871991fd430b646" "reference": "563835730692eb369a73fe4bb9a1b44a603c4ce7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/j0k3r/php-readability/zipball/c506b7ebd7afe77cd6e4e24c0871991fd430b646", "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/563835730692eb369a73fe4bb9a1b44a603c4ce7",
"reference": "c506b7ebd7afe77cd6e4e24c0871991fd430b646", "reference": "563835730692eb369a73fe4bb9a1b44a603c4ce7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4632,7 +4633,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/j0k3r/php-readability/issues", "issues": "https://github.com/j0k3r/php-readability/issues",
"source": "https://github.com/j0k3r/php-readability/tree/1.2.9" "source": "https://github.com/j0k3r/php-readability/tree/1.2.10"
}, },
"funding": [ "funding": [
{ {
@ -4640,7 +4641,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-11-29T20:06:47+00:00" "time": "2022-06-13T04:15:24+00:00"
}, },
{ {
"name": "javibravo/simpleue", "name": "javibravo/simpleue",
@ -5322,16 +5323,16 @@
}, },
{ {
"name": "laminas/laminas-diactoros", "name": "laminas/laminas-diactoros",
"version": "2.11.0", "version": "2.13.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laminas/laminas-diactoros.git", "url": "https://github.com/laminas/laminas-diactoros.git",
"reference": "d1bc565b23c2040fafde398a8a5db083c47928c0" "reference": "34ba65010be9aa74e159d168c5ecfa5c01e4d956"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/d1bc565b23c2040fafde398a8a5db083c47928c0", "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/34ba65010be9aa74e159d168c5ecfa5c01e4d956",
"reference": "d1bc565b23c2040fafde398a8a5db083c47928c0", "reference": "34ba65010be9aa74e159d168c5ecfa5c01e4d956",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5352,13 +5353,13 @@
"ext-dom": "*", "ext-dom": "*",
"ext-gd": "*", "ext-gd": "*",
"ext-libxml": "*", "ext-libxml": "*",
"http-interop/http-factory-tests": "^0.8.0", "http-interop/http-factory-tests": "^0.9.0",
"laminas/laminas-coding-standard": "~1.0.0", "laminas/laminas-coding-standard": "~2.3.0",
"php-http/psr7-integration-tests": "^1.1", "php-http/psr7-integration-tests": "^1.1.1",
"phpspec/prophecy-phpunit": "^2.0", "phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.1", "phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "^0.14.0", "psalm/plugin-phpunit": "^0.17.0",
"vimeo/psalm": "^4.3" "vimeo/psalm": "^4.24.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -5417,7 +5418,7 @@
"type": "community_bridge" "type": "community_bridge"
} }
], ],
"time": "2022-05-17T10:57:52+00:00" "time": "2022-07-07T12:31:03+00:00"
}, },
{ {
"name": "laminas/laminas-eventmanager", "name": "laminas/laminas-eventmanager",
@ -5488,16 +5489,16 @@
}, },
{ {
"name": "laminas/laminas-zendframework-bridge", "name": "laminas/laminas-zendframework-bridge",
"version": "1.5.0", "version": "1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laminas/laminas-zendframework-bridge.git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
"reference": "7f049390b756d34ba5940a8fb47634fbb51f79ab" "reference": "d74d2da21beae5aceff1e8c07b901066b0e1b719"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/7f049390b756d34ba5940a8fb47634fbb51f79ab", "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/d74d2da21beae5aceff1e8c07b901066b0e1b719",
"reference": "7f049390b756d34ba5940a8fb47634fbb51f79ab", "reference": "d74d2da21beae5aceff1e8c07b901066b0e1b719",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5546,7 +5547,7 @@
"type": "community_bridge" "type": "community_bridge"
} }
], ],
"time": "2022-02-22T22:17:01+00:00" "time": "2022-07-14T16:30:30+00:00"
}, },
{ {
"name": "lcobucci/jwt", "name": "lcobucci/jwt",
@ -5973,16 +5974,16 @@
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "1.27.0", "version": "1.27.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
"reference": "52ebd235c1f7e0d5e1b16464b695a28335f8e44a" "reference": "904713c5929655dc9b97288b69cfeedad610c9a1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/52ebd235c1f7e0d5e1b16464b695a28335f8e44a", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1",
"reference": "52ebd235c1f7e0d5e1b16464b695a28335f8e44a", "reference": "904713c5929655dc9b97288b69cfeedad610c9a1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6043,7 +6044,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/Seldaek/monolog/issues", "issues": "https://github.com/Seldaek/monolog/issues",
"source": "https://github.com/Seldaek/monolog/tree/1.27.0" "source": "https://github.com/Seldaek/monolog/tree/1.27.1"
}, },
"funding": [ "funding": [
{ {
@ -6055,7 +6056,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-13T20:29:46+00:00" "time": "2022-06-09T08:53:42+00:00"
}, },
{ {
"name": "nelmio/api-doc-bundle", "name": "nelmio/api-doc-bundle",
@ -6396,16 +6397,16 @@
}, },
{ {
"name": "paragonie/constant_time_encoding", "name": "paragonie/constant_time_encoding",
"version": "v2.5.0", "version": "v2.6.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git", "url": "https://github.com/paragonie/constant_time_encoding.git",
"reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8" "reference": "58c3f47f650c94ec05a151692652a868995d2938"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/9229e15f2e6ba772f0c55dd6986c563b937170a8", "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
"reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8", "reference": "58c3f47f650c94ec05a151692652a868995d2938",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6459,7 +6460,7 @@
"issues": "https://github.com/paragonie/constant_time_encoding/issues", "issues": "https://github.com/paragonie/constant_time_encoding/issues",
"source": "https://github.com/paragonie/constant_time_encoding" "source": "https://github.com/paragonie/constant_time_encoding"
}, },
"time": "2022-01-17T05:32:27+00:00" "time": "2022-06-14T06:56:20+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
@ -6748,16 +6749,16 @@
}, },
{ {
"name": "php-http/discovery", "name": "php-http/discovery",
"version": "1.14.2", "version": "1.14.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-http/discovery.git", "url": "https://github.com/php-http/discovery.git",
"reference": "c8d48852fbc052454af42f6de27635ddd916b959" "reference": "31d8ee46d0215108df16a8527c7438e96a4d7735"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-http/discovery/zipball/c8d48852fbc052454af42f6de27635ddd916b959", "url": "https://api.github.com/repos/php-http/discovery/zipball/31d8ee46d0215108df16a8527c7438e96a4d7735",
"reference": "c8d48852fbc052454af42f6de27635ddd916b959", "reference": "31d8ee46d0215108df16a8527c7438e96a4d7735",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6809,9 +6810,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/php-http/discovery/issues", "issues": "https://github.com/php-http/discovery/issues",
"source": "https://github.com/php-http/discovery/tree/1.14.2" "source": "https://github.com/php-http/discovery/tree/1.14.3"
}, },
"time": "2022-05-25T07:26:05+00:00" "time": "2022-07-11T14:04:40+00:00"
}, },
{ {
"name": "php-http/guzzle5-adapter", "name": "php-http/guzzle5-adapter",
@ -7461,16 +7462,16 @@
}, },
{ {
"name": "phpstan/phpdoc-parser", "name": "phpstan/phpdoc-parser",
"version": "1.5.1", "version": "1.6.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git", "url": "https://github.com/phpstan/phpdoc-parser.git",
"reference": "981cc368a216c988e862a75e526b6076987d1b50" "reference": "135607f9ccc297d6923d49c2bcf309f509413215"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/981cc368a216c988e862a75e526b6076987d1b50", "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/135607f9ccc297d6923d49c2bcf309f509413215",
"reference": "981cc368a216c988e862a75e526b6076987d1b50", "reference": "135607f9ccc297d6923d49c2bcf309f509413215",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7480,6 +7481,7 @@
"php-parallel-lint/php-parallel-lint": "^1.2", "php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/extension-installer": "^1.0", "phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^1.5", "phpstan/phpstan": "^1.5",
"phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-strict-rules": "^1.0", "phpstan/phpstan-strict-rules": "^1.0",
"phpunit/phpunit": "^9.5", "phpunit/phpunit": "^9.5",
"symfony/process": "^5.2" "symfony/process": "^5.2"
@ -7499,9 +7501,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types", "description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": { "support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues", "issues": "https://github.com/phpstan/phpdoc-parser/issues",
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.5.1" "source": "https://github.com/phpstan/phpdoc-parser/tree/1.6.4"
}, },
"time": "2022-05-05T11:32:40+00:00" "time": "2022-06-26T13:09:08+00:00"
}, },
{ {
"name": "phpzip/phpzip", "name": "phpzip/phpzip",
@ -9051,7 +9053,7 @@
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
"version": "v2.5.1", "version": "v2.5.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git", "url": "https://github.com/symfony/deprecation-contracts.git",
@ -9098,7 +9100,7 @@
"description": "A generic function and convention to trigger deprecation notices", "description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
}, },
"funding": [ "funding": [
{ {
@ -9205,16 +9207,16 @@
}, },
{ {
"name": "symfony/http-client-contracts", "name": "symfony/http-client-contracts",
"version": "v2.5.1", "version": "v2.5.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-client-contracts.git", "url": "https://github.com/symfony/http-client-contracts.git",
"reference": "1a4f708e4e87f335d1b1be6148060739152f0bd5" "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1a4f708e4e87f335d1b1be6148060739152f0bd5", "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70",
"reference": "1a4f708e4e87f335d1b1be6148060739152f0bd5", "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9263,7 +9265,7 @@
"standards" "standards"
], ],
"support": { "support": {
"source": "https://github.com/symfony/http-client-contracts/tree/v2.5.1" "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.2"
}, },
"funding": [ "funding": [
{ {
@ -9279,7 +9281,90 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-13T20:07:29+00:00" "time": "2022-04-12T15:48:08+00:00"
},
{
"name": "symfony/mime",
"version": "v5.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc",
"reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-mbstring": "^1.0",
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
"egulias/email-validator": "~3.0.0",
"phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0",
"symfony/mailer": "<4.4"
},
"require-dev": {
"egulias/email-validator": "^2.1.10|^3.1",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"symfony/dependency-injection": "^4.4|^5.0|^6.0",
"symfony/property-access": "^4.4|^5.1|^6.0",
"symfony/property-info": "^4.4|^5.1|^6.0",
"symfony/serializer": "^5.2|^6.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Symfony\\Component\\Mime\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Allows manipulating MIME messages",
"homepage": "https://symfony.com",
"keywords": [
"mime",
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v5.4.10"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2022-06-09T12:22:40+00:00"
}, },
{ {
"name": "symfony/monolog-bundle", "name": "symfony/monolog-bundle",
@ -10403,16 +10488,16 @@
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
"version": "v2.5.1", "version": "v2.5.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/service-contracts.git", "url": "https://github.com/symfony/service-contracts.git",
"reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
"reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10466,7 +10551,7 @@
"standards" "standards"
], ],
"support": { "support": {
"source": "https://github.com/symfony/service-contracts/tree/v2.5.1" "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
}, },
"funding": [ "funding": [
{ {
@ -10482,7 +10567,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-13T20:07:29+00:00" "time": "2022-05-30T19:17:29+00:00"
}, },
{ {
"name": "symfony/swiftmailer-bundle", "name": "symfony/swiftmailer-bundle",
@ -12096,16 +12181,16 @@
}, },
{ {
"name": "m6web/redis-mock", "name": "m6web/redis-mock",
"version": "v5.2.0", "version": "v5.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/BedrockStreaming/RedisMock.git", "url": "https://github.com/BedrockStreaming/RedisMock.git",
"reference": "958abce71d8f2bf6a5ce9ccfde0168408ee105cb" "reference": "e126231c0130ff2e83d53dbc0c305a8eed20372e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/BedrockStreaming/RedisMock/zipball/958abce71d8f2bf6a5ce9ccfde0168408ee105cb", "url": "https://api.github.com/repos/BedrockStreaming/RedisMock/zipball/e126231c0130ff2e83d53dbc0c305a8eed20372e",
"reference": "958abce71d8f2bf6a5ce9ccfde0168408ee105cb", "reference": "e126231c0130ff2e83d53dbc0c305a8eed20372e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -12139,9 +12224,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/BedrockStreaming/RedisMock/issues", "issues": "https://github.com/BedrockStreaming/RedisMock/issues",
"source": "https://github.com/BedrockStreaming/RedisMock/tree/v5.2.0" "source": "https://github.com/BedrockStreaming/RedisMock/tree/v5.3.0"
}, },
"time": "2022-01-24T09:32:59+00:00" "time": "2022-06-14T17:39:03+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
@ -12712,16 +12797,16 @@
}, },
{ {
"name": "symfony/phpunit-bridge", "name": "symfony/phpunit-bridge",
"version": "v6.1.0", "version": "v6.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git", "url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "092ccc3b364925cd8ed6046bc31dcf3a022bd5a4" "reference": "899fdec151add3dc339cf394a15100a1acc177ad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/092ccc3b364925cd8ed6046bc31dcf3a022bd5a4", "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/899fdec151add3dc339cf394a15100a1acc177ad",
"reference": "092ccc3b364925cd8ed6046bc31dcf3a022bd5a4", "reference": "899fdec151add3dc339cf394a15100a1acc177ad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -12775,7 +12860,7 @@
"description": "Provides utilities for PHPUnit, especially user deprecation notices management", "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.1.0" "source": "https://github.com/symfony/phpunit-bridge/tree/v6.1.2"
}, },
"funding": [ "funding": [
{ {
@ -12791,7 +12876,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-04-12T16:22:53+00:00" "time": "2022-06-20T12:01:07+00:00"
} }
], ],
"aliases": [], "aliases": [],

30
package.json
View file

@ -36,13 +36,13 @@
"url": "https://github.com/wallabag/wallabag/issues" "url": "https://github.com/wallabag/wallabag/issues"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.18.5", "@babel/core": "^7.18.13",
"@babel/eslint-parser": "^7.18.2", "@babel/eslint-parser": "^7.18.9",
"@babel/preset-env": "^7.18.2", "@babel/preset-env": "^7.18.10",
"autoprefixer": "^10.4.7", "autoprefixer": "^10.4.8",
"babel-loader": "^8.2.5", "babel-loader": "^8.2.5",
"css-loader": "^6.7.1", "css-loader": "^6.7.1",
"eslint": "^8.18.0", "eslint": "^8.22.0",
"eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.26.0",
"eslint-webpack-plugin": "^3.2.0", "eslint-webpack-plugin": "^3.2.0",
@ -50,21 +50,21 @@
"lato-font": "^3.0.0", "lato-font": "^3.0.0",
"mini-css-extract-plugin": "^2.6.1", "mini-css-extract-plugin": "^2.6.1",
"node-sass": "^7.0.1", "node-sass": "^7.0.1",
"postcss": "^8.4.14", "postcss": "^8.4.16",
"postcss-loader": "^7.0.0", "postcss-loader": "^7.0.1",
"postcss-scss": "^4.0.4", "postcss-scss": "^4.0.4",
"sass": "^1.53.0", "sass": "^1.54.5",
"sass-loader": "^13.0.1", "sass-loader": "^13.0.2",
"style-loader": "^3.3.1", "style-loader": "^3.3.1",
"stylelint": "^14.9.1", "stylelint": "^14.11.0",
"stylelint-config-standard": "^26.0.0", "stylelint-config-standard": "^26.0.0",
"stylelint-scss": "^4.2.0", "stylelint-scss": "^4.3.0",
"stylelint-webpack-plugin": "^3.3.0", "stylelint-webpack-plugin": "^3.3.0",
"terser-webpack-plugin": "^5.3.3", "terser-webpack-plugin": "^5.3.5",
"url-loader": "^4.1.1", "url-loader": "^4.1.1",
"webpack": "^5.73.0", "webpack": "^5.74.0",
"webpack-cli": "^4.10.0", "webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2", "webpack-dev-server": "^4.10.0",
"webpack-manifest-plugin": "^5.0.0", "webpack-manifest-plugin": "^5.0.0",
"webpack-merge": "^5.7.3" "webpack-merge": "^5.7.3"
}, },
@ -72,7 +72,7 @@
"annotator": "wallabag/annotator#master", "annotator": "wallabag/annotator#master",
"clipboard": "^2.0.11", "clipboard": "^2.0.11",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"highlight.js": "^11.5.1", "highlight.js": "^11.6.0",
"icomoon-free-npm": "^0.0.0", "icomoon-free-npm": "^0.0.0",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"jquery.cookie": "^1.4.1", "jquery.cookie": "^1.4.1",

6
src/Wallabag/CoreBundle/Resources/translations/messages.gl.yml
View file

@ -1,7 +1,7 @@
howto: howto:
shortcuts: shortcuts:
list_title: Atallos dispoñibles nas páxinas con listaxes list_title: Atallos dispoñibles nas páxinas con listaxes
go_logout: Desconectar go_logout: Saír
go_howto: Ir ós titoriais (esta páxina!) go_howto: Ir ós titoriais (esta páxina!)
go_developers: Ir a desenvolvedoras go_developers: Ir a desenvolvedoras
go_import: Ir a importar go_import: Ir a importar
@ -359,7 +359,7 @@ menu:
input_label: Escribe aquí a túa busca input_label: Escribe aquí a túa busca
top: top:
account: A miña conta account: A miña conta
random_entry: Ir a unha entrada ó chou desa listaxe random_entry: Ir a unha entrada ao chou dos da lista
export: Exportar export: Exportar
filter_entries: Filtrar entradas filter_entries: Filtrar entradas
search: Buscar search: Buscar
@ -376,7 +376,7 @@ menu:
save_link: Gardar ligazón save_link: Gardar ligazón
search: Buscar search: Buscar
about: Acerca de about: Acerca de
logout: Desconectar logout: Saír
developer: Xestión dos clientes API developer: Xestión dos clientes API
howto: Titoriais howto: Titoriais
import: Importar import: Importar

10
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
View file

@ -37,6 +37,7 @@ menu:
theme_toggle_auto: Otomatik tema theme_toggle_auto: Otomatik tema
theme_toggle_dark: Koyu renk tema theme_toggle_dark: Koyu renk tema
theme_toggle_light: Açık renk tema theme_toggle_light: Açık renk tema
with_annotations: Açıklama metinleriyle
top: top:
add_new_entry: Yeni bir makale ekle add_new_entry: Yeni bir makale ekle
search: Ara search: Ara
@ -244,6 +245,8 @@ entry:
delete: Sil delete: Sil
export_title: Dışa Aktar export_title: Dışa Aktar
number_of_tags: '{1}ve başka etiket|]1,Inf[ve %count% başka etiket' number_of_tags: '{1}ve başka etiket|]1,Inf[ve %count% başka etiket'
show_same_domain: Aynı etki alanına sahip makaleleri göster
assign_search_tag: Bu aramayı her sonuca bir etiket olarak ata
filters: filters:
title: Filtreler title: Filtreler
status_label: Durum status_label: Durum
@ -268,6 +271,7 @@ entry:
is_public_label: Herkese açık bağlantısı var is_public_label: Herkese açık bağlantısı var
is_public_help: Herkese açık bağlantı is_public_help: Herkese açık bağlantı
http_status_label: HTTP durumu http_status_label: HTTP durumu
annotated_label: Açıklamalı
view: view:
left_menu: left_menu:
back_to_homepage: Geri back_to_homepage: Geri
@ -319,6 +323,8 @@ entry:
filtered_search: 'Arama kriteri ile filtrele:' filtered_search: 'Arama kriteri ile filtrele:'
untagged: Etiketlenmemiş makaleler untagged: Etiketlenmemiş makaleler
all: Tüm makaleler all: Tüm makaleler
with_annotations: Açıklama metinleri olan makaleler
same_domain: Aynı etki alanı
search: search:
placeholder: Neye bakıyordunuz? placeholder: Neye bakıyordunuz?
public: public:
@ -529,6 +535,10 @@ import:
elcurator: elcurator:
description: Bu içe aktarıcı tüm elCurator makalelerinizi içe aktaracak. elCurator hesabınızda tercihlerinize gidin ve ardından içeriğinizi dışa aktarın. Bir JSON dosyanız olacak. description: Bu içe aktarıcı tüm elCurator makalelerinizi içe aktaracak. elCurator hesabınızda tercihlerinize gidin ve ardından içeriğinizi dışa aktarın. Bir JSON dosyanız olacak.
page_title: İçe Aktar > elCurator page_title: İçe Aktar > elCurator
delicious:
page_title: İçe aktar > del.icio.us
description: Bu içe aktarıcı tüm Delicious yer imlerinizi içe aktaracaktır. 2021'den beri, dışa aktarma sayfasını kullanarak verilerinizi tekrar dışa aktarabilirsiniz (https://del.icio.us/export). "JSON" biçimini seçin ve indirin ("delicious_export.2021.02.06_21.10.json" gibi).
how_to: Lütfen Delicious dışa aktarım dosyanızı seçin ve aşağıdaki düğmeye tıklayarak içe aktarın.
user: user:
form: form:
username_label: Kullanıcı adı username_label: Kullanıcı adı

2
src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml
View file

@ -1,7 +1,7 @@
auth_code: auth_code:
on: an on: an
mailer: mailer:
subject: wallabag-Authentifizierungcode subject: wallabag-Authentifizierungscode
body: body:
hello: Hallo %user%, hello: Hallo %user%,
first_para: Da du die Zwei-Faktor-Authentifizierung in deinem wallabag-Konto aktiviert hast und du dich gerade von einem neuen Gerät (Computer, Handy, etc.) anmeldest, senden wir dir einen Code, um deinen Zugriff zu prüfen. first_para: Da du die Zwei-Faktor-Authentifizierung in deinem wallabag-Konto aktiviert hast und du dich gerade von einem neuen Gerät (Computer, Handy, etc.) anmeldest, senden wir dir einen Code, um deinen Zugriff zu prüfen.

2
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View file

@ -1489,7 +1489,7 @@ class EntryControllerTest extends WallabagCoreTestCase
'it', 'it',
], ],
'zh_CN' => [ 'zh_CN' => [
'http://www.hao123.com/shequ?__noscript__-=1', 'http://tuijian.hao123.com/tuijian/?__noscript__-=1',
'zh_CN', 'zh_CN',
], ],
'pt_BR' => [ 'pt_BR' => [

2
web/wallassets/baggy.js
View file

File diff suppressed because one or more lines are too long

2
web/wallassets/baggy.js.map
View file

File diff suppressed because one or more lines are too long

4
web/wallassets/material.css
View file

File diff suppressed because one or more lines are too long

2
web/wallassets/material.css.map
View file

File diff suppressed because one or more lines are too long

2
web/wallassets/material.js
View file

File diff suppressed because one or more lines are too long

2
web/wallassets/material.js.map
View file

File diff suppressed because one or more lines are too long

1591
yarn.lock
View file

File diff suppressed because it is too large Load diff