kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10092 from firefly-iii/release-1743665835

Browse Source 
🤖 Automatically merge the PR into the develop branch.
This commit is contained in:
github-actions[bot]
2025-04-03 09:37:23 +02:00
committed by GitHub
parent 1c6ec82c91 db226c2584
commit 9d03f2e0d8
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Notifications/Admin/UnknownUserLoginAttempt.php
View File

@@ -113,7 +113,7 @@ class UnknownUserLoginAttempt extends Notification
public function via(OwnerNotifiable $notifiable): array public function via(OwnerNotifiable $notifiable): array
{ {
$channels = ReturnsAvailableChannels::returnChannels('owner'); $channels = ReturnsAvailableChannels::returnChannels('owner');
$isDemoSite = FireflyConfig::get('is_demo_site',false)->data; $isDemoSite = FireflyConfig::get('is_demo_site', false)->data;
if (true === $isDemoSite) { if (true === $isDemoSite) {
return array_diff($channels, ['mail']); return array_diff($channels, ['mail']);
} }

2
config/firefly.php
View File

@@ -78,7 +78,7 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => 'develop/2025-04-02', 'version' => 'develop/2025-04-03',
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 25, 'db_version' => 25,

32
package-lock.json generated
View File

@@ -3111,13 +3111,13 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "22.13.17", "version": "22.14.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.17.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz",
"integrity": "sha512-nAJuQXoyPj04uLgu+obZcSmsfOenUg6DxPKogeUy6yNCFwWaj5sBF8/G/pNo8EtBJjAfSVgfIlugR/BCOleO+g==", "integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"undici-types": "~6.20.0" "undici-types": "~6.21.0"
} }
}, },
"node_modules/@types/node-forge": { "node_modules/@types/node-forge": {
@@ -4420,9 +4420,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001707", "version": "1.0.30001709",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001709.tgz",
"integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", "integrity": "sha512-NgL3vUTnDrPCZ3zTahp4fsugQ4dc7EKTSzwQDPEel6DMoMnfH2jhry9n2Zm8onbSR+f/QtKHFOA+iAQu4kbtWA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@@ -5635,9 +5635,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.5.129", "version": "1.5.130",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.130.tgz",
"integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", "integrity": "sha512-Ou2u7L9j2XLZbhqzyX0jWDj6gA8D3jIfVzt4rikLf3cGBa0VdReuFimBKS9tQJA4+XpeCxj1NoWlfBXzbMa9IA==",
"dev": true, "dev": true,
"license": "ISC" "license": "ISC"
}, },
@@ -10083,9 +10083,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.86.1", "version": "1.86.2",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.86.1.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.86.2.tgz",
"integrity": "sha512-Yaok4XELL1L9Im/ZUClKu//D2OP1rOljKj0Gf34a+GzLbMveOzL7CfqYo+JUa5Xt1nhTCW+OcKp/FtR7/iqj1w==", "integrity": "sha512-Rpfn0zAIDqvnSb2DihJTDFjbhqLHu91Wqac9rxontWk7R+2txcPjuujMqu1eeoezh5kAblVCS5EdFdyr0Jmu+w==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -11107,9 +11107,9 @@
} }
}, },
"node_modules/undici-types": { "node_modules/undici-types": {
"version": "6.20.0", "version": "6.21.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },

4
resources/assets/v1/src/locales/ko.json
View File

@@ -153,7 +153,7 @@
"url": "URL", "url": "URL",
"active": "\ud65c\uc131", "active": "\ud65c\uc131",
"interest_date": "\uc774\uc790 \ub0a0\uc9dc", "interest_date": "\uc774\uc790 \ub0a0\uc9dc",
"administration_currency": "Native currency", "administration_currency": "\uc790\uad6d \ud1b5\ud654",
"title": "\uc81c\ubaa9", "title": "\uc81c\ubaa9",
"date": "\ub0a0\uc9dc", "date": "\ub0a0\uc9dc",
"book_date": "\uc608\uc57d\uc77c", "book_date": "\uc608\uc57d\uc77c",
@@ -173,7 +173,7 @@
"list": { "list": {
"title": "\uc81c\ubaa9", "title": "\uc81c\ubaa9",
"active": "\ud65c\uc131 \uc0c1\ud0dc\uc785\ub2c8\uae4c?", "active": "\ud65c\uc131 \uc0c1\ud0dc\uc785\ub2c8\uae4c?",
"native_currency": "Native currency", "native_currency": "\uc790\uad6d \ud1b5\ud654",
"trigger": "\ud2b8\ub9ac\uac70", "trigger": "\ud2b8\ub9ac\uac70",
"response": "\uc751\ub2f5", "response": "\uc751\ub2f5",
"delivery": "\uc804\ub2ec", "delivery": "\uc804\ub2ec",