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 'main' into develop

Browse Source 
# Conflicts:
#	package-lock.json
#	resources/assets/v1/package.json
This commit is contained in:
James Cole 2024-08-25 07:37:50 +02:00
commit 57f5ebc0f9
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package-lock.json generated
View File

@ -4,7 +4,6 @@
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "firefly-iii",
"hasInstallScript": true, "hasInstallScript": true,
"workspaces": [ "workspaces": [
"resources/assets/v1", "resources/assets/v1",
@ -10909,8 +10908,8 @@
}, },
"devDependencies": { "devDependencies": {
"@johmun/vue-tags-input": "^2", "@johmun/vue-tags-input": "^2",
"@vue/compiler-sfc": "^3.4.34", "@vue/compiler-sfc": "^3.3.4",
"axios": "^1.3", "axios": "^1.7",
"bootstrap-sass": "^3", "bootstrap-sass": "^3",
"cross-env": "^7.0", "cross-env": "^7.0",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
@ -10950,7 +10949,7 @@
"store": "^2.0.12" "store": "^2.0.12"
}, },
"devDependencies": { "devDependencies": {
"axios": "^1.6.8", "axios": "^1.7.4",
"laravel-vite-plugin": "^1.0.5", "laravel-vite-plugin": "^1.0.5",
"patch-package": "^8.0.0", "patch-package": "^8.0.0",
"sass": "^1.77.8", "sass": "^1.77.8",

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

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

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

@ -8,7 +8,7 @@
"postinstall": "patch-package --error-on-fail" "postinstall": "patch-package --error-on-fail"
}, },
"devDependencies": { "devDependencies": {
"axios": "^1.6.8", "axios": "^1.7.4",
"laravel-vite-plugin": "^1.0.5", "laravel-vite-plugin": "^1.0.5",
"patch-package": "^8.0.0", "patch-package": "^8.0.0",
"sass": "^1.77.8", "sass": "^1.77.8",