diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php
index c5794b2925..c16e4d7d9e 100644
--- a/app/Exceptions/GracefulNotFoundHandler.php
+++ b/app/Exceptions/GracefulNotFoundHandler.php
@@ -61,6 +61,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
}
$name = $route->getName();
if (!auth()->check()) {
+
return parent::render($request, $e);
}
diff --git a/public/v1/js/ff/list/groups.js b/public/v1/js/ff/list/groups.js
index 609477bdb4..7d8f0f81a9 100644
--- a/public/v1/js/ff/list/groups.js
+++ b/public/v1/js/ff/list/groups.js
@@ -122,10 +122,12 @@ function countChecked() {
function checkAll() {
$('.mass-select').prop('checked', true);
+ $('.select-all').prop('checked', true);
}
function uncheckAll() {
$('.mass-select').prop('checked', false);
+ $('.select-all').prop('checked', false);
}
function updateActionButtons() {
diff --git a/resources/views/accounts/reconcile/transactions.blade.php b/resources/views/accounts/reconcile/transactions.blade.php
index 4187f76b73..955fc1fd66 100644
--- a/resources/views/accounts/reconcile/transactions.blade.php
+++ b/resources/views/accounts/reconcile/transactions.blade.php
@@ -65,7 +65,7 @@
-
diff --git a/resources/views/components/lists/groups-large.blade.php b/resources/views/components/lists/groups-large.blade.php
index 814f3d1057..b6aba7765c 100644
--- a/resources/views/components/lists/groups-large.blade.php
+++ b/resources/views/components/lists/groups-large.blade.php
@@ -225,7 +225,7 @@
-
+
-
+
diff --git a/resources/views/components/report/partial/journals-audit.blade.php b/resources/views/components/report/partial/journals-audit.blade.php
index 48fa0f7057..5be2fc389e 100644
--- a/resources/views/components/report/partial/journals-audit.blade.php
+++ b/resources/views/components/report/partial/journals-audit.blade.php
@@ -40,8 +40,8 @@
diff --git a/resources/views/layout/v3/blank.blade.php b/resources/views/layout/v3/blank.blade.php
index 947c8753c3..a2b68e361f 100644
--- a/resources/views/layout/v3/blank.blade.php
+++ b/resources/views/layout/v3/blank.blade.php
@@ -14,7 +14,7 @@
please visit the following page: https://bit.ly/FF3-broken-base-href
-->
- {{ __('firefly.login_page_title') }}
+ @yield('status') - {{ $title ?? 'Firefly III' }}
@@ -36,7 +36,7 @@
- Firefly III - @yield('status_code') @yield('status') :(
+ Firefly III - @yield('status_code') @yield('status')
@yield('sub_title')
@yield('content')
diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php
index 1af422834a..146a04dec0 100644
--- a/resources/views/profile/index.blade.php
+++ b/resources/views/profile/index.blade.php
@@ -83,7 +83,7 @@
- {{ __('firefly.regenerate_command_line_token') }}
diff --git a/resources/views/reports/partials/budget-period.blade.php b/resources/views/reports/partials/budget-period.blade.php
index 7e63ce6374..5c71163d1a 100644
--- a/resources/views/reports/partials/budget-period.blade.php
+++ b/resources/views/reports/partials/budget-period.blade.php
@@ -14,9 +14,9 @@
@if($info['id'] !== 0)
-
+
@else
-
+
@endif
diff --git a/resources/views/reports/partials/category-period.blade.php b/resources/views/reports/partials/category-period.blade.php
index a0cedbe780..7322629f90 100644
--- a/resources/views/reports/partials/category-period.blade.php
+++ b/resources/views/reports/partials/category-period.blade.php
@@ -13,9 +13,9 @@
@if($info['id'] !== 0)
-
+
@else
-
+
@endif
diff --git a/resources/views/settings/link/index.blade.php b/resources/views/settings/link/index.blade.php
index a1326e139d..c1d0a2dc0d 100644
--- a/resources/views/settings/link/index.blade.php
+++ b/resources/views/settings/link/index.blade.php
@@ -23,9 +23,9 @@
@if($linkType->editable)
@endif
diff --git a/resources/views/transactions/mass/edit.blade.php b/resources/views/transactions/mass/edit.blade.php
index bb283270dc..c3a9d2448a 100644
--- a/resources/views/transactions/mass/edit.blade.php
+++ b/resources/views/transactions/mass/edit.blade.php
@@ -30,13 +30,13 @@
{{-- LINK TO EDIT FORM --}}
-
{{-- DESCRIPTION --}}
-
@@ -44,16 +44,14 @@
@if(false === $journal['reconciled'])
- {{ $journal['currency_symbol'] }}
-
-
+ {{ $journal['currency_symbol'] }}
+
+
@if(null !== $journal['foreign_amount'])
{{-- insert foreign data --}}
- {{ $journal['foreign_currency_symbol'] }}
+ {{ $journal['foreign_currency_symbol'] }}
{{-- DATE --}}
-
@@ -99,17 +97,18 @@
@if(false === $journal['reconciled'])
{{-- SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL --}}
@if($journal['transaction_type_type'] == 'Transfer' or $journal['transaction_type_type'] == 'Withdrawal')
-
+
@foreach($withdrawalSources as $account)
id === $journal['source_account_id']) selected @endif
label="{{ $account->name }}">{{ $account->name }}
@endforeach
+
@endif
{{-- SOURCE ACCOUNT NAME FOR DEPOSIT --}}
@if($journal['transaction_type_type'] == 'Deposit')
-
+
@foreach($depositDestinations as $account)
id === $journal['destination_account_id']) selected="selected" @endif
label="{{ $account->name }}">{{ $account->name }}
@@ -134,22 +133,22 @@
{{-- DESTINATION ACCOUNT NAME FOR WITHDRAWAL --}}
@if($journal['transaction_type_type'] === 'Withdrawal')
-
+ value="@if(array_key_exists('destination_account_type', $journal) && $journal['destination_account_type'] !== 'Cash account') {{ $journal['destination_account_name'] }}@endif">
@endif
@endif
{{-- category --}}
-
{{-- budget --}}
@if($journal['transaction_type_type'] === 'Withdrawal')
-
+
{{ __('firefly.no_budget') }}
@foreach($budgets as $budget)