Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

This commit is contained in:
James Cole 2024-01-22 06:13:26 +01:00
commit 37aa5bcc60
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 16 additions and 16 deletions

22
composer.lock generated
View File

@ -542,16 +542,16 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "3.7.2", "version": "3.7.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "0ac3c270590e54910715e9a1a044cc368df282b2" "reference": "ce594cbc39a4866c544f1a970d285ff0548221ad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2", "url": "https://api.github.com/repos/doctrine/dbal/zipball/ce594cbc39a4866c544f1a970d285ff0548221ad",
"reference": "0ac3c270590e54910715e9a1a044cc368df282b2", "reference": "ce594cbc39a4866c544f1a970d285ff0548221ad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -567,14 +567,14 @@
"doctrine/coding-standard": "12.0.0", "doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1", "fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1", "jetbrains/phpstorm-stubs": "2023.1",
"phpstan/phpstan": "1.10.42", "phpstan/phpstan": "1.10.56",
"phpstan/phpstan-strict-rules": "^1.5", "phpstan/phpstan-strict-rules": "^1.5",
"phpunit/phpunit": "9.6.13", "phpunit/phpunit": "9.6.15",
"psalm/plugin-phpunit": "0.18.4", "psalm/plugin-phpunit": "0.18.4",
"slevomat/coding-standard": "8.13.1", "slevomat/coding-standard": "8.13.1",
"squizlabs/php_codesniffer": "3.7.2", "squizlabs/php_codesniffer": "3.8.1",
"symfony/cache": "^5.4|^6.0", "symfony/cache": "^5.4|^6.0|^7.0",
"symfony/console": "^4.4|^5.4|^6.0", "symfony/console": "^4.4|^5.4|^6.0|^7.0",
"vimeo/psalm": "4.30.0" "vimeo/psalm": "4.30.0"
}, },
"suggest": { "suggest": {
@ -635,7 +635,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.7.2" "source": "https://github.com/doctrine/dbal/tree/3.7.3"
}, },
"funding": [ "funding": [
{ {
@ -651,7 +651,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-11-19T08:06:58+00:00" "time": "2024-01-21T07:53:09+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",

8
package-lock.json generated
View File

@ -15,7 +15,7 @@
"chartjs-adapter-date-fns": "^3.0.0", "chartjs-adapter-date-fns": "^3.0.0",
"chartjs-chart-sankey": "^0.12.0", "chartjs-chart-sankey": "^0.12.0",
"date-fns": "^3.2.0", "date-fns": "^3.2.0",
"i18next": "^23.7.16", "i18next": "^23.7.18",
"i18next-chained-backend": "^4.6.2", "i18next-chained-backend": "^4.6.2",
"i18next-http-backend": "^2.4.2", "i18next-http-backend": "^2.4.2",
"i18next-localstorage-backend": "^4.2.0", "i18next-localstorage-backend": "^4.2.0",
@ -719,9 +719,9 @@
} }
}, },
"node_modules/i18next": { "node_modules/i18next": {
"version": "23.7.17", "version": "23.7.18",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-23.7.17.tgz", "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.7.18.tgz",
"integrity": "sha512-Wh3mNWeVlwx5HrDSPeJNUYZUrEwFbqykjy80ktIbgRKz41P51wRNyMfXSf5fICyHNJX4O/4XWbecFkprfS8G6w==", "integrity": "sha512-b9N2KjRCYQNlUvE1Kc83g8knyUkL5NiZQOp9BsTR/v/LXk6Fzz+doOzTg2/826XK28mCgBkYLNAtixjE58qpCw==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",

View File

@ -23,7 +23,7 @@
"chartjs-adapter-date-fns": "^3.0.0", "chartjs-adapter-date-fns": "^3.0.0",
"chartjs-chart-sankey": "^0.12.0", "chartjs-chart-sankey": "^0.12.0",
"date-fns": "^3.2.0", "date-fns": "^3.2.0",
"i18next": "^23.7.16", "i18next": "^23.7.18",
"i18next-chained-backend": "^4.6.2", "i18next-chained-backend": "^4.6.2",
"i18next-http-backend": "^2.4.2", "i18next-http-backend": "^2.4.2",
"i18next-localstorage-backend": "^4.2.0", "i18next-localstorage-backend": "^4.2.0",