mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-23 01:21:03 +00:00
Merge branch 'master' into issue#6772
This commit is contained in:
Viktorius Suwandi
GitHub
commit
19d3e878cf
8 changed files with 481 additions and 560 deletions
|
|
@ -86,7 +86,6 @@
|
|||
"kphoen/rulerz": "^0.21",
|
||||
"kphoen/rulerz-bundle": "~0.13",
|
||||
"laminas/laminas-code": "^4.7",
|
||||
"laminas/laminas-diactoros": "^2.3",
|
||||
"lcobucci/jwt": "~4.1.5",
|
||||
"lexik/form-filter-bundle": "^7.0",
|
||||
"mgargano/simplehtmldom": "~1.5",
|
||||
|
|
|
|||
127
composer.lock
generated
127
composer.lock
generated
|
|
@ -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": "1f7c20bf034c1595dacf792986d5d42a",
|
||||
"content-hash": "06c7851bf5727a02748ea05472188a80",
|
||||
"packages": [
|
||||
{
|
||||
"name": "babdev/pagerfanta-bundle",
|
||||
|
|
@ -4959,22 +4959,22 @@
|
|||
},
|
||||
{
|
||||
"name": "jms/serializer",
|
||||
"version": "3.26.0",
|
||||
"version": "3.27.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/schmittjoh/serializer.git",
|
||||
"reference": "926a7d57438fa1ff4ab794551c5ae26e68536853"
|
||||
"reference": "e8c812460d7b47b15bc0ccd78901276bd44ad452"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/schmittjoh/serializer/zipball/926a7d57438fa1ff4ab794551c5ae26e68536853",
|
||||
"reference": "926a7d57438fa1ff4ab794551c5ae26e68536853",
|
||||
"url": "https://api.github.com/repos/schmittjoh/serializer/zipball/e8c812460d7b47b15bc0ccd78901276bd44ad452",
|
||||
"reference": "e8c812460d7b47b15bc0ccd78901276bd44ad452",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/annotations": "^1.13 || ^2.0",
|
||||
"doctrine/instantiator": "^1.0.3 || ^2.0",
|
||||
"doctrine/lexer": "^2",
|
||||
"doctrine/lexer": "^2.0 || ^3.0",
|
||||
"jms/metadata": "^2.6",
|
||||
"php": "^7.2||^8.0",
|
||||
"phpstan/phpdoc-parser": "^0.4 || ^0.5 || ^1.0"
|
||||
|
|
@ -5043,7 +5043,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/schmittjoh/serializer/issues",
|
||||
"source": "https://github.com/schmittjoh/serializer/tree/3.26.0"
|
||||
"source": "https://github.com/schmittjoh/serializer/tree/3.27.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5051,7 +5051,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2023-06-24T19:25:58+00:00"
|
||||
"time": "2023-07-29T22:33:44+00:00"
|
||||
},
|
||||
{
|
||||
"name": "jms/serializer-bundle",
|
||||
|
|
@ -5459,103 +5459,6 @@
|
|||
],
|
||||
"time": "2022-11-21T01:32:31+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laminas/laminas-diactoros",
|
||||
"version": "2.17.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laminas/laminas-diactoros.git",
|
||||
"reference": "5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5",
|
||||
"reference": "5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.4 || ~8.0.0 || ~8.1.0",
|
||||
"psr/http-factory": "^1.0",
|
||||
"psr/http-message": "^1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"zendframework/zend-diactoros": "*"
|
||||
},
|
||||
"provide": {
|
||||
"psr/http-factory-implementation": "1.0",
|
||||
"psr/http-message-implementation": "1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-curl": "*",
|
||||
"ext-dom": "*",
|
||||
"ext-gd": "*",
|
||||
"ext-libxml": "*",
|
||||
"http-interop/http-factory-tests": "^0.9.0",
|
||||
"laminas/laminas-coding-standard": "^2.4.0",
|
||||
"php-http/psr7-integration-tests": "^1.1.1",
|
||||
"phpunit/phpunit": "^9.5.23",
|
||||
"psalm/plugin-phpunit": "^0.17.0",
|
||||
"vimeo/psalm": "^4.24.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"laminas": {
|
||||
"config-provider": "Laminas\\Diactoros\\ConfigProvider",
|
||||
"module": "Laminas\\Diactoros"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"files": [
|
||||
"src/functions/create_uploaded_file.php",
|
||||
"src/functions/marshal_headers_from_sapi.php",
|
||||
"src/functions/marshal_method_from_sapi.php",
|
||||
"src/functions/marshal_protocol_version_from_sapi.php",
|
||||
"src/functions/marshal_uri_from_sapi.php",
|
||||
"src/functions/normalize_server.php",
|
||||
"src/functions/normalize_uploaded_files.php",
|
||||
"src/functions/parse_cookie_header.php",
|
||||
"src/functions/create_uploaded_file.legacy.php",
|
||||
"src/functions/marshal_headers_from_sapi.legacy.php",
|
||||
"src/functions/marshal_method_from_sapi.legacy.php",
|
||||
"src/functions/marshal_protocol_version_from_sapi.legacy.php",
|
||||
"src/functions/marshal_uri_from_sapi.legacy.php",
|
||||
"src/functions/normalize_server.legacy.php",
|
||||
"src/functions/normalize_uploaded_files.legacy.php",
|
||||
"src/functions/parse_cookie_header.legacy.php"
|
||||
],
|
||||
"psr-4": {
|
||||
"Laminas\\Diactoros\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"description": "PSR HTTP Message implementations",
|
||||
"homepage": "https://laminas.dev",
|
||||
"keywords": [
|
||||
"http",
|
||||
"laminas",
|
||||
"psr",
|
||||
"psr-17",
|
||||
"psr-7"
|
||||
],
|
||||
"support": {
|
||||
"chat": "https://laminas.dev/chat",
|
||||
"docs": "https://docs.laminas.dev/laminas-diactoros/",
|
||||
"forum": "https://discourse.laminas.dev",
|
||||
"issues": "https://github.com/laminas/laminas-diactoros/issues",
|
||||
"rss": "https://github.com/laminas/laminas-diactoros/releases.atom",
|
||||
"source": "https://github.com/laminas/laminas-diactoros"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://funding.communitybridge.org/projects/laminas-project",
|
||||
"type": "community_bridge"
|
||||
}
|
||||
],
|
||||
"time": "2022-08-30T17:01:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "lcobucci/clock",
|
||||
"version": "2.0.0",
|
||||
|
|
@ -13387,16 +13290,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/phpunit-bridge",
|
||||
"version": "v6.3.1",
|
||||
"version": "v6.3.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/phpunit-bridge.git",
|
||||
"reference": "0b0bf59b0d9bd1422145a123a67fb12af546ef0d"
|
||||
"reference": "e020e1efbd1b42cb670fcd7d19a25abbddba035d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/0b0bf59b0d9bd1422145a123a67fb12af546ef0d",
|
||||
"reference": "0b0bf59b0d9bd1422145a123a67fb12af546ef0d",
|
||||
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e020e1efbd1b42cb670fcd7d19a25abbddba035d",
|
||||
"reference": "e020e1efbd1b42cb670fcd7d19a25abbddba035d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -13448,7 +13351,7 @@
|
|||
"description": "Provides utilities for PHPUnit, especially user deprecation notices management",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.1"
|
||||
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.2"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -13464,7 +13367,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-06-23T13:25:16+00:00"
|
||||
"time": "2023-07-12T16:00:22+00:00"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
|
|
@ -13498,5 +13401,5 @@
|
|||
"platform-overrides": {
|
||||
"php": "7.4.29"
|
||||
},
|
||||
"plugin-api-version": "2.3.0"
|
||||
"plugin-api-version": "2.2.0"
|
||||
}
|
||||
|
|
|
|||
19
package.json
19
package.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "wallabag",
|
||||
"version": "2.5.0",
|
||||
"version": "2.6.0",
|
||||
"description": "wallabag is a self hostable application for saving web pages",
|
||||
"private": true,
|
||||
"directories": {
|
||||
|
|
@ -17,17 +17,22 @@
|
|||
{
|
||||
"name": "Nicolas Lœuillet",
|
||||
"email": "nicolas@loeuillet.org",
|
||||
"homepage": "http://www.cdetc.fr",
|
||||
"homepage": "https://nicolas.loeuillet.org",
|
||||
"role": "Developer"
|
||||
},
|
||||
{
|
||||
"name": "Thomas Citharel",
|
||||
"homepage": "http://tcit.fr",
|
||||
"homepage": "https://tcit.fr",
|
||||
"role": "Developer"
|
||||
},
|
||||
{
|
||||
"name": "Jérémy Benoist",
|
||||
"homepage": "http://www.j0k3r.net",
|
||||
"homepage": "https://www.j0k3r.net",
|
||||
"role": "Developer"
|
||||
},
|
||||
{
|
||||
"name": "Kevin Decherf",
|
||||
"homepage": "https://kdecherf.com/",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
|
|
@ -42,9 +47,9 @@
|
|||
"autoprefixer": "^10.4.14",
|
||||
"babel-loader": "^9.1.3",
|
||||
"css-loader": "^6.8.1",
|
||||
"eslint": "^8.45.0",
|
||||
"eslint": "^8.46.0",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
"eslint-plugin-import": "^2.27.5",
|
||||
"eslint-plugin-import": "^2.28.0",
|
||||
"eslint-webpack-plugin": "^4.0.1",
|
||||
"file-loader": "^6.2.0",
|
||||
"lato-font": "^3.0.0",
|
||||
|
|
@ -79,7 +84,7 @@
|
|||
"jquery.cookie": "^1.4.1",
|
||||
"jr-qrcode": "^1.0.7",
|
||||
"material-design-icons-iconfont": "^6.7.0",
|
||||
"materialize-css": "^0.98.1",
|
||||
"materialize-css": "^0.100.2",
|
||||
"mathjax": "^3.2.2",
|
||||
"mousetrap": "^1.6.0",
|
||||
"ptsans-npm-webfont": "^0.0.4",
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue