IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Cole 2024-07-27 15:42:54 +02:00
commit 0b52fb84f1
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -108,7 +108,7 @@
"spatie/laravel-ignition": "^2",
"spatie/period": "^2.4",
"symfony/expression-language": "^7.0",
"symfony/http-client": "^7.0",
"symfony/http-client": "^7.1",
"symfony/mailgun-mailer": "^7.1"
},
"require-dev": {

14
composer.lock generated
View File

@ -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": "6cd802a45a1a3e8c69b988e2e1506f54",
"content-hash": "49c6cd315f6cba880b9fa088236e8088",
"packages": [
{
"name": "bacon/bacon-qr-code",
@ -7252,16 +7252,16 @@
},
{
"name": "symfony/http-client",
"version": "v7.1.2",
"version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "90ace27d17ccc9afc6f7ec0081e8529fb0e29425"
"reference": "b79858aa7a051ea791b0d50269a234a0b50cb231"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/90ace27d17ccc9afc6f7ec0081e8529fb0e29425",
"reference": "90ace27d17ccc9afc6f7ec0081e8529fb0e29425",
"url": "https://api.github.com/repos/symfony/http-client/zipball/b79858aa7a051ea791b0d50269a234a0b50cb231",
"reference": "b79858aa7a051ea791b0d50269a234a0b50cb231",
"shasum": ""
},
"require": {
@ -7326,7 +7326,7 @@
"http"
],
"support": {
"source": "https://github.com/symfony/http-client/tree/v7.1.2"
"source": "https://github.com/symfony/http-client/tree/v7.1.3"
},
"funding": [
{
@ -7342,7 +7342,7 @@
"type": "tidelift"
}
],
"time": "2024-06-28T08:00:31+00:00"
"time": "2024-07-17T06:10:24+00:00"
},
{
"name": "symfony/http-client-contracts",

50
package-lock.json generated
View File

@ -2951,39 +2951,39 @@
}
},
"node_modules/@vue/compiler-core": {
"version": "3.4.33",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.33.tgz",
"integrity": "sha512-MoIREbkdPQlnGfSKDMgzTqzqx5nmEjIc0ydLVYlTACGBsfvOJ4tHSbZXKVF536n6fB+0eZaGEOqsGThPpdvF5A==",
"version": "3.4.34",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.34.tgz",
"integrity": "sha512-Z0izUf32+wAnQewjHu+pQf1yw00EGOmevl1kE+ljjjMe7oEfpQ+BI3/JNK7yMB4IrUsqLDmPecUrpj3mCP+yJQ==",
"dev": true,
"dependencies": {
"@babel/parser": "^7.24.7",
"@vue/shared": "3.4.33",
"@vue/shared": "3.4.34",
"entities": "^4.5.0",
"estree-walker": "^2.0.2",
"source-map-js": "^1.2.0"
}
},
"node_modules/@vue/compiler-dom": {
"version": "3.4.33",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.33.tgz",
"integrity": "sha512-GzB8fxEHKw0gGet5BKlpfXEqoBnzSVWwMnT+dc25wE7pFEfrU/QsvjZMP9rD4iVXHBBoemTct8mN0GJEI6ZX5A==",
"version": "3.4.34",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.34.tgz",
"integrity": "sha512-3PUOTS1h5cskdOJMExCu2TInXuM0j60DRPpSCJDqOCupCfUZCJoyQmKtRmA8EgDNZ5kcEE7vketamRZfrEuVDw==",
"dev": true,
"dependencies": {
"@vue/compiler-core": "3.4.33",
"@vue/shared": "3.4.33"
"@vue/compiler-core": "3.4.34",
"@vue/shared": "3.4.34"
}
},
"node_modules/@vue/compiler-sfc": {
"version": "3.4.33",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.33.tgz",
"integrity": "sha512-7rk7Vbkn21xMwIUpHQR4hCVejwE6nvhBOiDgoBcR03qvGqRKA7dCBSsHZhwhYUsmjlbJ7OtD5UFIyhP6BY+c8A==",
"version": "3.4.34",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.34.tgz",
"integrity": "sha512-x6lm0UrM03jjDXTPZgD9Ad8bIVD1ifWNit2EaWQIZB5CULr46+FbLQ5RpK7AXtDHGjx9rmvC7QRCTjsiGkAwRw==",
"dev": true,
"dependencies": {
"@babel/parser": "^7.24.7",
"@vue/compiler-core": "3.4.33",
"@vue/compiler-dom": "3.4.33",
"@vue/compiler-ssr": "3.4.33",
"@vue/shared": "3.4.33",
"@vue/compiler-core": "3.4.34",
"@vue/compiler-dom": "3.4.34",
"@vue/compiler-ssr": "3.4.34",
"@vue/shared": "3.4.34",
"estree-walker": "^2.0.2",
"magic-string": "^0.30.10",
"postcss": "^8.4.39",
@ -2991,13 +2991,13 @@
}
},
"node_modules/@vue/compiler-ssr": {
"version": "3.4.33",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.33.tgz",
"integrity": "sha512-0WveC9Ai+eT/1b6LCV5IfsufBZ0HP7pSSTdDjcuW302tTEgoBw8rHVHKPbGUtzGReUFCRXbv6zQDDgucnV2WzQ==",
"version": "3.4.34",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.34.tgz",
"integrity": "sha512-8TDBcLaTrFm5rnF+Qm4BlliaopJgqJ28Nsrc80qazynm5aJO+Emu7y0RWw34L8dNnTRdcVBpWzJxhGYzsoVu4g==",
"dev": true,
"dependencies": {
"@vue/compiler-dom": "3.4.33",
"@vue/shared": "3.4.33"
"@vue/compiler-dom": "3.4.34",
"@vue/shared": "3.4.34"
}
},
"node_modules/@vue/component-compiler-utils": {
@ -3072,9 +3072,9 @@
"integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
},
"node_modules/@vue/shared": {
"version": "3.4.33",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.33.tgz",
"integrity": "sha512-aoRY0jQk3A/cuvdkodTrM4NMfxco8n55eG4H7ML/CRy7OryHfiqvug4xrCBBMbbN+dvXAetDDwZW9DXWWjBntA==",
"version": "3.4.34",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.34.tgz",
"integrity": "sha512-x5LmiRLpRsd9KTjAB8MPKf0CDPMcuItjP0gbNqFCIgL1I8iYp4zglhj9w9FPCdIbHG2M91RVeIbArFfFTz9I3A==",
"dev": true
},
"node_modules/@webassemblyjs/ast": {
@ -10923,7 +10923,7 @@
},
"devDependencies": {
"@johmun/vue-tags-input": "^2",
"@vue/compiler-sfc": "^3.3.4",
"@vue/compiler-sfc": "^3.4.34",
"axios": "^1.3",
"bootstrap-sass": "^3",
"cross-env": "^7.0",

2
resources/assets/v1/package.json
View File

@ -15,7 +15,7 @@
},
"devDependencies": {
"@johmun/vue-tags-input": "^2",
"@vue/compiler-sfc": "^3.3.4",
"@vue/compiler-sfc": "^3.4.34",
"axios": "^1.3",
"bootstrap-sass": "^3",
"cross-env": "^7.0",