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

🤖 Auto commit for release 'develop' on 2025-04-01

Browse Source
This commit is contained in:
JC5
2025-04-01 07:07:06 +02:00
parent 6626dfbac3
commit 4427f2fb99
10 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.ci/php-cs-fixer/composer.lock generated
View File

@@ -406,16 +406,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v3.74.0", "version": "v3.75.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "6b7cb12a6cf592fd9a2b46a2d5d4c3b44003973d" "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6b7cb12a6cf592fd9a2b46a2d5d4c3b44003973d", "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/399a128ff2fdaf4281e4e79b755693286cdf325c",
"reference": "6b7cb12a6cf592fd9a2b46a2d5d4c3b44003973d", "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -498,7 +498,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.74.0" "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.75.0"
}, },
"funding": [ "funding": [
{ {
@@ -506,7 +506,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-03-27T22:31:30+00:00" "time": "2025-03-31T18:40:42+00:00"
}, },
{ {
"name": "psr/container", "name": "psr/container",

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

@@ -112,11 +112,12 @@ 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'); $isDemoSite = FireflyConfig::get('is_demo_site');
if(true === $isDemoSite) { if (true === $isDemoSite) {
return array_diff($channels, ['mail']); return array_diff($channels, ['mail']);
} }
return $channels; return $channels;
} }
} }

7
app/Notifications/Security/UserFailedLoginAttempt.php
View File

@@ -104,11 +104,12 @@ class UserFailedLoginAttempt extends Notification
*/ */
public function via(User $notifiable): array public function via(User $notifiable): array
{ {
$channels = ReturnsAvailableChannels::returnChannels('user', $notifiable); $channels = ReturnsAvailableChannels::returnChannels('user', $notifiable);
$isDemoSite = FireflyConfig::get('is_demo_site'); $isDemoSite = FireflyConfig::get('is_demo_site');
if(true === $isDemoSite) { if (true === $isDemoSite) {
return array_diff($channels, ['mail']); return array_diff($channels, ['mail']);
} }
return $channels; return $channels;
} }
} }

5
app/Notifications/Test/OwnerTestNotificationEmail.php
View File

@@ -64,10 +64,11 @@ class OwnerTestNotificationEmail extends Notification
*/ */
public function via(OwnerNotifiable $notifiable): array public function via(OwnerNotifiable $notifiable): array
{ {
$isDemoSite = FireflyConfig::get('is_demo_site'); $isDemoSite = FireflyConfig::get('is_demo_site');
if(true === $isDemoSite) { if (true === $isDemoSite) {
return []; return [];
} }
return ['mail']; return ['mail'];
} }
} }

5
app/Notifications/Test/UserTestNotificationEmail.php
View File

@@ -61,10 +61,11 @@ class UserTestNotificationEmail extends Notification
*/ */
public function via(User $notifiable): array public function via(User $notifiable): array
{ {
$isDemoSite = FireflyConfig::get('is_demo_site'); $isDemoSite = FireflyConfig::get('is_demo_site');
if(true === $isDemoSite) { if (true === $isDemoSite) {
return []; return [];
} }
return ['mail']; return ['mail'];
} }
} }

7
app/Notifications/User/NewAccessToken.php
View File

@@ -102,11 +102,12 @@ class NewAccessToken extends Notification
*/ */
public function via(User $notifiable): array public function via(User $notifiable): array
{ {
$channels = ReturnsAvailableChannels::returnChannels('user', $notifiable); $channels = ReturnsAvailableChannels::returnChannels('user', $notifiable);
$isDemoSite = FireflyConfig::get('is_demo_site'); $isDemoSite = FireflyConfig::get('is_demo_site');
if(true === $isDemoSite) { if (true === $isDemoSite) {
return array_diff($channels, ['mail']); return array_diff($channels, ['mail']);
} }
return $channels; return $channels;
} }
} }

6
composer.lock generated
View File

@@ -12828,7 +12828,7 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
@@ -12849,6 +12849,6 @@
"ext-xml": "*", "ext-xml": "*",
"ext-xmlwriter": "*" "ext-xmlwriter": "*"
}, },
"platform-dev": [], "platform-dev": {},
"plugin-api-version": "2.3.0" "plugin-api-version": "2.6.0"
} }

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-03-31', 'version' => 'develop/2025-04-01',
'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,

24
package-lock.json generated
View File

@@ -3209,9 +3209,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/ws": { "node_modules/@types/ws": {
"version": "8.18.0", "version": "8.18.1",
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
"integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==", "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -5635,9 +5635,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.5.128", "version": "1.5.129",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.128.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz",
"integrity": "sha512-bo1A4HH/NS522Ws0QNFIzyPcyUUNV/yyy70Ho1xqfGYzPUme2F/xr4tlEOuM6/A538U1vDA7a4XfCd1CKRegKQ==", "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==",
"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.0", "version": "1.86.1",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.86.0.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.86.1.tgz",
"integrity": "sha512-zV8vGUld/+mP4KbMLJMX7TyGCuUp7hnkOScgCMsWuHtns8CWBoz+vmEhoGMXsaJrbUP8gj+F1dLvVe79sK8UdA==", "integrity": "sha512-Yaok4XELL1L9Im/ZUClKu//D2OP1rOljKj0Gf34a+GzLbMveOzL7CfqYo+JUa5Xt1nhTCW+OcKp/FtR7/iqj1w==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -11304,9 +11304,9 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "6.2.3", "version": "6.2.4",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.3.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.4.tgz",
"integrity": "sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg==", "integrity": "sha512-veHMSew8CcRzhL5o8ONjy8gkfmFJAd5Ac16oxBUjlwgX3Gq2Wqr+qNC3TjPIpy7TPV/KporLga5GT9HqdrCizw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

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

@@ -46,7 +46,7 @@
"tags": "Etiquetas", "tags": "Etiquetas",
"no_budget": "(sin presupuesto)", "no_budget": "(sin presupuesto)",
"no_bill": "(no subscription)", "no_bill": "(no subscription)",
"category": "Categoria", "category": "Categor\u00eda",
"attachments": "Archivos adjuntos", "attachments": "Archivos adjuntos",
"notes": "Notas", "notes": "Notas",
"external_url": "URL externa", "external_url": "URL externa",