kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-21 11:27:57 -07:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-03-13

Browse Source
This commit is contained in:
JC5
2026-03-13 08:11:23 +01:00
parent 238bfc819e
commit 21447a9b2f
11 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Api/V1/Controllers/Models/Recurrence/TriggerController.php
-1
View File
@@ -1,6 +1,5 @@
<?php
/*
* TriggerController.php
* Copyright (c) 2026 james@firefly-iii.org
app/Api/V1/Controllers/System/BatchController.php
-1
View File
@@ -1,6 +1,5 @@
<?php
/*
* BatchController.php
* Copyright (c) 2026 james@firefly-iii.org
app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php
-1
View File
@@ -1,6 +1,5 @@
<?php
/*
* AutocompleteApiRequest.php
* Copyright (c) 2026 james@firefly-iii.org
app/Console/Commands/SendTestEmail.php
+8 -9
View File
@@ -1,6 +1,5 @@
<?php
/*
* SendTestEmail.php
* Copyright (c) 2026 james@firefly-iii.org
@@ -40,7 +39,7 @@ class SendTestEmail extends Command
*
* @var string
*/
protected $signature = 'firefly-iii:send-test-email
protected $signature = 'firefly-iii:send-test-email
{--user=1 : The user ID.}
{--token= : The user\'s access token.}';
@@ -56,25 +55,25 @@ class SendTestEmail extends Command
*/
public function handle(): int
{
$user = $this->getUser();
$user = $this->getUser();
if (!$user->hasRole('owner')) {
$this->friendlyError((string)trans('firefly.must_be_owner'));
$this->friendlyError((string) trans('firefly.must_be_owner'));
return Command::FAILURE;
}
/** @var int $lastNotification */
$lastNotification = FireflyConfig::get('last_test_notification', 123)->data;
if (time() - $lastNotification < 120) {
$this->friendlyError((string)trans('firefly.test_rate_limited'));
if ((time() - $lastNotification) < 120) {
$this->friendlyError((string) trans('firefly.test_rate_limited'));
return Command::FAILURE;
}
$owner = new OwnerNotifiable();
$owner = new OwnerNotifiable();
event(new OwnerTestsNotificationChannel('email', $owner));
FireflyConfig::set('last_test_notification',time());
FireflyConfig::set('last_test_notification', time());
return Command::SUCCESS;
}
}
app/Http/Controllers/Admin/NotificationController.php
+6 -4
View File
@@ -123,16 +123,17 @@ final class NotificationController extends Controller
return redirect(route('settings.notification.index'));
}
/** @var int $lastNotification */
$lastNotification = FireflyConfig::get('last_test_notification', 123)->data;
if (time() - $lastNotification < 120) {
if ((time() - $lastNotification) < 120) {
session()->flash('error', (string) trans('firefly.test_rate_limited'));
return redirect(route('settings.notification.index'));
}
$all = $request->all();
$channel = $all['test_submit'] ?? '';
$all = $request->all();
$channel = $all['test_submit'] ?? '';
switch ($channel) {
default:
@@ -149,7 +150,8 @@ final class NotificationController extends Controller
event(new OwnerTestsNotificationChannel($channel, $owner));
session()->flash('success', (string) trans('firefly.notification_test_executed', ['channel' => $channel]));
}
FireflyConfig::set('last_test_notification',time());
FireflyConfig::set('last_test_notification', time());
return redirect(route('settings.notification.index'));
}
}
app/Http/Controllers/Auth/LoginController.php
-1
View File
@@ -33,7 +33,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
app/Http/Controllers/Auth/RegisterController.php
-1
View File
@@ -31,7 +31,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Http\Controllers\CreateStuff;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\RedirectResponse;
app/Http/Middleware/Authenticate.php
-3
View File
@@ -26,14 +26,12 @@ namespace FireflyIII\Http\Middleware;
use Closure;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\User;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Contracts\Auth\Factory as Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
/**
* Class Authenticate
*/
@@ -100,7 +98,6 @@ class Authenticate
throw new FireflyException('This point is generally unreachable.');
// exit('five');
// foreach ($guards as $guard) {
// exit('six');
app/Providers/RouteServiceProvider.php
-1
View File
@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Providers;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Override;
/**
config/firefly.php
+1 -1
View File
@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-03-13',
'build_time' => 1773370359,
'build_time' => 1773385699,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.
resources/lang/en_US/firefly.php
+2 -2
View File
@@ -197,7 +197,7 @@ return [
'journals_in_period_for_category' => 'All transactions for category :name between :start and :end',
'journals_in_period_for_tag' => 'All transactions for tag :tag between :start and :end',
'not_available_demo_user' => 'The feature you try to access is not available to demo users.',
'test_rate_limited' => 'Please wait a moment before trying again',
'test_rate_limited' => 'Please wait a moment before trying again',
'exchange_rate_instructions' => 'Asset account "@name" only accepts transactions in @primary_currency. If you wish to use @foreign_currency instead, make sure that the amount in @primary_currency is known as well:',
'transfer_exchange_rate_instructions' => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
'transaction_data' => 'Transaction data',
@@ -1527,7 +1527,7 @@ return [
'administration_role_mng_currencies' => 'Manage currencies',
'administration_role_view_reports' => 'View reports',
'administration_role_full' => 'Full access',
'must_be_owner' => 'You must be system owner to do this',
'must_be_owner' => 'You must be system owner to do this',
// mfa
'enable_mfa' => 'Enable multi-factor authentication',