kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-25 13:10:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into v6.2

Browse Source 
# Conflicts:
#	composer.lock
#	config/firefly.php
#	package-lock.json
This commit is contained in:
James Cole
2024-12-18 16:39:22 +01:00
parent 2d10f255c2 fe6021a3d6
commit e8a6f30e4e
7 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/v1/src/locales/ru.json
View File

@@ -129,7 +129,7 @@
"logs": "\u041b\u043e\u0433\u0438",
"response": "\u041e\u0442\u0432\u0435\u0442",
"visit_webhook_url": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c URL \u0432\u0435\u0431\u0445\u0443\u043a\u0430",
"reset_webhook_secret": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0441\u0435\u043a\u0440\u0435\u0442 webhook"
"reset_webhook_secret": ""
},
"form": {
"url": "\u0421\u0441\u044b\u043b\u043a\u0430",

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

@@ -12,14 +12,14 @@
"laravel-vite-plugin": "^1.0.5",
"patch-package": "^8.0.0",
"sass": "^1.78.0",
"vite": "^5",
"vite": "^6",
"vite-plugin-manifest-sri": "^0.2.0"
},
"dependencies": {
"@ag-grid-community/client-side-row-model": "^32.0.2",
"@ag-grid-community/core": "^32.0.2",
"@ag-grid-community/infinite-row-model": "^32.0.2",
"@ag-grid-community/styles": "^32.0.0",
"@ag-grid-community/styles": "^33.0.2",
"@fortawesome/fontawesome-free": "^6.4.0",
"@popperjs/core": "^2.11.8",
"admin-lte": "^4.0.0-alpha3",
@@ -29,7 +29,7 @@
"bootstrap5-tags": "^1.7",
"chart.js": "^4.4.0",
"chartjs-adapter-date-fns": "^3.0.0",
"chartjs-chart-sankey": "^0.13.0",
"chartjs-chart-sankey": "^0.14.0",
"date-fns": "^4.0.0",
"i18next": "^24.0.0",
"i18next-chained-backend": "^4.6.2",