mirror of
https://github.com/humhub/humhub.git
synced 2025-04-20 23:21:54 +02:00
Merge branch 'develop' of github.com:humhub/humhub into develop
This commit is contained in:
Lucas Bartholemy
commit
d67c965aa4
@ -58,7 +58,7 @@
|
||||
"npm-asset/swiped-events": "^1.0.9",
|
||||
"npm-asset/timeago": "^1.6.3",
|
||||
"npm-asset/unicode-emoji-json": "^0.5.0",
|
||||
"phpoffice/phpspreadsheet": "^2.2",
|
||||
"phpoffice/phpspreadsheet": "^4.1",
|
||||
"raoul2000/yii2-jcrop-widget": "^1.0",
|
||||
"symfony/amazon-mailer": "^5.4",
|
||||
"symfony/google-mailer": "^5.4",
|
||||
|
||||
75
composer.lock
generated
75
composer.lock
generated
@ -4,20 +4,20 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "4f85eca73b8f8d9be0e346c70184aca3",
|
||||
"content-hash": "e08badf3dfa713d8e575a3c7e35a5eae",
|
||||
"packages": [
|
||||
{
|
||||
"name": "async-aws/core",
|
||||
"version": "1.24.1",
|
||||
"version": "1.25.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/async-aws/core.git",
|
||||
"reference": "241c8ab0e4cd4f47b2226a31a5132fb36a73a57b"
|
||||
"reference": "19e1ac6978730a59bf71ad3fa584bc588df11ae2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/async-aws/core/zipball/241c8ab0e4cd4f47b2226a31a5132fb36a73a57b",
|
||||
"reference": "241c8ab0e4cd4f47b2226a31a5132fb36a73a57b",
|
||||
"url": "https://api.github.com/repos/async-aws/core/zipball/19e1ac6978730a59bf71ad3fa584bc588df11ae2",
|
||||
"reference": "19e1ac6978730a59bf71ad3fa584bc588df11ae2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -39,7 +39,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.24-dev"
|
||||
"dev-master": "1.25-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -60,7 +60,7 @@
|
||||
"sts"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/async-aws/core/tree/1.24.1"
|
||||
"source": "https://github.com/async-aws/core/tree/1.25.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -72,20 +72,20 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2025-01-15T14:38:08+00:00"
|
||||
"time": "2025-03-05T20:41:02+00:00"
|
||||
},
|
||||
{
|
||||
"name": "async-aws/ses",
|
||||
"version": "1.10.0",
|
||||
"version": "1.11.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/async-aws/ses.git",
|
||||
"reference": "53b605b2cfd914faa7bc25b017a36b498aeb017b"
|
||||
"reference": "d3518fc1180b05bc257a3e2581c50307272a978c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/async-aws/ses/zipball/53b605b2cfd914faa7bc25b017a36b498aeb017b",
|
||||
"reference": "53b605b2cfd914faa7bc25b017a36b498aeb017b",
|
||||
"url": "https://api.github.com/repos/async-aws/ses/zipball/d3518fc1180b05bc257a3e2581c50307272a978c",
|
||||
"reference": "d3518fc1180b05bc257a3e2581c50307272a978c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -96,7 +96,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.10-dev"
|
||||
"dev-master": "1.11-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -117,7 +117,7 @@
|
||||
"ses"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/async-aws/ses/tree/1.10.0"
|
||||
"source": "https://github.com/async-aws/ses/tree/1.11.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -129,14 +129,14 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2025-01-15T09:28:33+00:00"
|
||||
"time": "2025-03-05T20:41:02+00:00"
|
||||
},
|
||||
{
|
||||
"name": "bower-asset/bootstrap",
|
||||
"version": "v3.4.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twbs/bootstrap.git",
|
||||
"url": "git@github.com:twbs/bootstrap.git",
|
||||
"reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
|
||||
},
|
||||
"dist": {
|
||||
@ -4530,20 +4530,20 @@
|
||||
},
|
||||
{
|
||||
"name": "phpoffice/phpspreadsheet",
|
||||
"version": "2.3.8",
|
||||
"version": "4.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
|
||||
"reference": "7a700683743bf1c4a21837c84b266916f1aa7d25"
|
||||
"reference": "6ff18c3a8df3a945492f75ce455d77f7ad55dd5c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/7a700683743bf1c4a21837c84b266916f1aa7d25",
|
||||
"reference": "7a700683743bf1c4a21837c84b266916f1aa7d25",
|
||||
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/6ff18c3a8df3a945492f75ce455d77f7ad55dd5c",
|
||||
"reference": "6ff18c3a8df3a945492f75ce455d77f7ad55dd5c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer/pcre": "^1 || ^2 || ^3",
|
||||
"composer/pcre": "^1||^2||^3",
|
||||
"ext-ctype": "*",
|
||||
"ext-dom": "*",
|
||||
"ext-fileinfo": "*",
|
||||
@ -4574,7 +4574,7 @@
|
||||
"phpcompatibility/php-compatibility": "^9.3",
|
||||
"phpstan/phpstan": "^1.1",
|
||||
"phpstan/phpstan-phpunit": "^1.0",
|
||||
"phpunit/phpunit": "^9.6 || ^10.5",
|
||||
"phpunit/phpunit": "^10.5",
|
||||
"squizlabs/php_codesniffer": "^3.7",
|
||||
"tecnickcom/tcpdf": "^6.5"
|
||||
},
|
||||
@ -4629,9 +4629,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
|
||||
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.3.8"
|
||||
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/4.1.0"
|
||||
},
|
||||
"time": "2025-02-08T03:01:45+00:00"
|
||||
"time": "2025-03-02T06:52:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpoption/phpoption",
|
||||
@ -11402,16 +11402,16 @@
|
||||
},
|
||||
{
|
||||
"name": "friendsofphp/php-cs-fixer",
|
||||
"version": "v3.70.2",
|
||||
"version": "v3.71.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
|
||||
"reference": "1ca468270efbb75ce0c7566a79cca8ea2888584d"
|
||||
"reference": "3825ffdc69501e1c9230291b79f036a0c0d8749d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/1ca468270efbb75ce0c7566a79cca8ea2888584d",
|
||||
"reference": "1ca468270efbb75ce0c7566a79cca8ea2888584d",
|
||||
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3825ffdc69501e1c9230291b79f036a0c0d8749d",
|
||||
"reference": "3825ffdc69501e1c9230291b79f036a0c0d8749d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -11493,7 +11493,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
|
||||
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.70.2"
|
||||
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.71.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -11501,7 +11501,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2025-03-03T21:07:23+00:00"
|
||||
"time": "2025-03-07T23:06:56+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/psr7",
|
||||
@ -12434,12 +12434,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Roave/SecurityAdvisories.git",
|
||||
"reference": "e7cacb4409da236548159072e5eff2c30cd3bf9c"
|
||||
"reference": "4da22c240293fcf0fe72fc0b1f2f265efeb44e2e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e7cacb4409da236548159072e5eff2c30cd3bf9c",
|
||||
"reference": "e7cacb4409da236548159072e5eff2c30cd3bf9c",
|
||||
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4da22c240293fcf0fe72fc0b1f2f265efeb44e2e",
|
||||
"reference": "4da22c240293fcf0fe72fc0b1f2f265efeb44e2e",
|
||||
"shasum": ""
|
||||
},
|
||||
"conflict": {
|
||||
@ -12767,7 +12767,7 @@
|
||||
"lara-zeus/artemis": ">=1,<=1.0.6",
|
||||
"lara-zeus/dynamic-dashboard": ">=3,<=3.0.1",
|
||||
"laravel/fortify": "<1.11.1",
|
||||
"laravel/framework": "<6.20.45|>=7,<7.30.7|>=8,<8.83.28|>=9,<9.52.17|>=10,<10.48.23|>=11,<11.31",
|
||||
"laravel/framework": "<11.44.1|>=12,<12.1.1",
|
||||
"laravel/laravel": ">=5.4,<5.4.22",
|
||||
"laravel/pulse": "<1.3.1",
|
||||
"laravel/reverb": "<1.4",
|
||||
@ -12787,6 +12787,7 @@
|
||||
"limesurvey/limesurvey": "<6.5.12",
|
||||
"livehelperchat/livehelperchat": "<=3.91",
|
||||
"livewire/livewire": "<2.12.7|>=3.0.0.0-beta1,<3.5.2",
|
||||
"livewire/volt": "<1.7",
|
||||
"lms/routes": "<2.1.1",
|
||||
"localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
|
||||
"luyadev/yii-helpers": "<1.2.1",
|
||||
@ -12920,7 +12921,7 @@
|
||||
"phpmyadmin/phpmyadmin": "<5.2.2",
|
||||
"phpmyfaq/phpmyfaq": "<3.2.5|==3.2.5|>=3.2.10,<=4.0.1",
|
||||
"phpoffice/common": "<0.2.9",
|
||||
"phpoffice/phpexcel": "<1.8.1",
|
||||
"phpoffice/phpexcel": "<=1.8.2",
|
||||
"phpoffice/phpspreadsheet": "<1.29.9|>=2,<2.1.8|>=2.2,<2.3.7|>=3,<3.9",
|
||||
"phpseclib/phpseclib": "<2.0.47|>=3,<3.0.36",
|
||||
"phpservermon/phpservermon": "<3.6",
|
||||
@ -12976,7 +12977,7 @@
|
||||
"rap2hpoutre/laravel-log-viewer": "<0.13",
|
||||
"react/http": ">=0.7,<1.9",
|
||||
"really-simple-plugins/complianz-gdpr": "<6.4.2",
|
||||
"redaxo/source": "<=5.18.1",
|
||||
"redaxo/source": "<5.18.3",
|
||||
"remdex/livehelperchat": "<4.29",
|
||||
"reportico-web/reportico": "<=8.1",
|
||||
"rhukster/dom-sanitizer": "<1.0.7",
|
||||
@ -13302,7 +13303,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-03-03T20:05:19+00:00"
|
||||
"time": "2025-03-06T18:06:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "softcreatr/jsonpath",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user