diff --git a/composer.lock b/composer.lock index a37de58aea..3c3e58f09d 100644 --- a/composer.lock +++ b/composer.lock @@ -6535,16 +6535,16 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "0.14-dev" - }, "laravel": { - "providers": [ - "TwigBridge\\ServiceProvider" - ], "aliases": { "Twig": "TwigBridge\\Facade\\Twig" - } + }, + "providers": [ + "TwigBridge\\ServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "0.14-dev" } }, "autoload": { diff --git a/config/firefly.php b/config/firefly.php index 0e99851db1..8c5c7d6c21 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -110,7 +110,7 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2024-12-15', +'version' => 'develop/2024-12-16', 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 25, diff --git a/package-lock.json b/package-lock.json index 3bd6d1889d..1c24f92a41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4380,14 +4380,14 @@ } }, "node_modules/call-bound": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.2.tgz", - "integrity": "sha512-0lk0PHFe/uz0vl527fG9CgdE9WdafjDbCXvBbs+LUv000TVt2Jjhqbs4Jwm8gz070w8xXyEAxrPOMullsxXeGg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", + "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.8", - "get-intrinsic": "^1.2.5" + "call-bind-apply-helpers": "^1.0.1", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" diff --git a/resources/assets/v1/src/locales/ru.json b/resources/assets/v1/src/locales/ru.json index b068d714a5..dab5f13086 100644 --- a/resources/assets/v1/src/locales/ru.json +++ b/resources/assets/v1/src/locales/ru.json @@ -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",