mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2024-12-02 13:39:19 -06:00
Merge branch 'release/v6.0.13'
This commit is contained in:
James Cole
commit
f6e778e1d4
@ -66,9 +66,7 @@ class UserController extends Controller
|
||||
}
|
||||
);
|
||||
$this->middleware(IsDemoUser::class)->except(['index', 'show']);
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
$authGuard = config('firefly.authentication_guard');
|
||||
$this->externalIdentity = 'eloquent' !== $loginProvider || 'web' !== $authGuard;
|
||||
$this->externalIdentity = 'web' !== config('firefly.authentication_guard');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -64,10 +64,7 @@ class ConfirmPasswordController extends Controller
|
||||
parent::__construct();
|
||||
$this->middleware('auth');
|
||||
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
$authGuard = config('firefly.authentication_guard');
|
||||
|
||||
if ('eloquent' !== $loginProvider || 'web' !== $authGuard) {
|
||||
if ('web' !== config('firefly.authentication_guard')) {
|
||||
throw new FireflyException('Using external identity provider. Cannot continue.');
|
||||
}
|
||||
}
|
||||
|
||||
@ -53,10 +53,7 @@ class ForgotPasswordController extends Controller
|
||||
parent::__construct();
|
||||
$this->middleware('guest');
|
||||
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
$authGuard = config('firefly.authentication_guard');
|
||||
|
||||
if ('eloquent' !== $loginProvider || 'web' !== $authGuard) {
|
||||
if ('web' !== config('firefly.authentication_guard')) {
|
||||
throw new FireflyException('Using external identity provider. Cannot continue.');
|
||||
}
|
||||
}
|
||||
@ -72,10 +69,8 @@ class ForgotPasswordController extends Controller
|
||||
public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
|
||||
{
|
||||
Log::info('Start of sendResetLinkEmail()');
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
|
||||
if ('eloquent' !== $loginProvider) {
|
||||
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
|
||||
if ('web' !== config('firefly.authentication_guard')) {
|
||||
$message = sprintf('Cannot reset password when authenticating over "%s".', config('firefly.authentication_guard'));
|
||||
Log::error($message);
|
||||
|
||||
return view('error', compact('message'));
|
||||
@ -117,9 +112,8 @@ class ForgotPasswordController extends Controller
|
||||
*/
|
||||
public function showLinkRequestForm()
|
||||
{
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
if ('eloquent' !== $loginProvider) {
|
||||
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
|
||||
if ('web' !== config('firefly.authentication_guard')) {
|
||||
$message = sprintf('Cannot reset password when authenticating over "%s".', config('firefly.authentication_guard'));
|
||||
|
||||
return view('error', compact('message'));
|
||||
}
|
||||
|
||||
@ -70,10 +70,7 @@ class RegisterController extends Controller
|
||||
parent::__construct();
|
||||
$this->middleware('guest');
|
||||
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
$authGuard = config('firefly.authentication_guard');
|
||||
|
||||
if ('eloquent' !== $loginProvider || 'web' !== $authGuard) {
|
||||
if ('web' !== config('firefly.authentication_guard')) {
|
||||
throw new FireflyException('Using external identity provider. Cannot continue.');
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,10 +65,7 @@ class ResetPasswordController extends Controller
|
||||
parent::__construct();
|
||||
$this->middleware('guest');
|
||||
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
$authGuard = config('firefly.authentication_guard');
|
||||
|
||||
if ('eloquent' !== $loginProvider || 'web' !== $authGuard) {
|
||||
if ('web' !== config('firefly.authentication_guard')) {
|
||||
throw new FireflyException('Using external identity provider. Cannot continue.');
|
||||
}
|
||||
}
|
||||
@ -84,9 +81,8 @@ class ResetPasswordController extends Controller
|
||||
*/
|
||||
public function reset(Request $request)
|
||||
{
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
if ('eloquent' !== $loginProvider) {
|
||||
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
|
||||
if ('web' !== config('firefly.authentication_guard')) {
|
||||
$message = sprintf('Cannot reset password when authenticating over "%s".', config('firefly.authentication_guard'));
|
||||
|
||||
return view('error', compact('message'));
|
||||
}
|
||||
@ -131,9 +127,8 @@ class ResetPasswordController extends Controller
|
||||
*/
|
||||
public function showResetForm(Request $request, $token = null)
|
||||
{
|
||||
$loginProvider = config('firefly.login_provider');
|
||||
if ('eloquent' !== $loginProvider) {
|
||||
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
|
||||
if ('web' !== config('firefly.authentication_guard')) {
|
||||
$message = sprintf('Cannot reset password when authenticating over "%s".', config('firefly.authentication_guard'));
|
||||
|
||||
return view('error', compact('message'));
|
||||
}
|
||||
|
||||
@ -3,6 +3,12 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
## v6.0.13 - 2023-06-12
|
||||
|
||||
### Fixed
|
||||
|
||||
- [Issue 7641](https://github.com/firefly-iii/firefly-iii/issues/7641) Crash with AUTHENTICATION_GUARD=web
|
||||
|
||||
## v6.0.12 - 2023-06-12
|
||||
|
||||
### Changed
|
||||
@ -21,7 +27,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
### API
|
||||
|
||||
- [Issue 7588](https://github.com/firefly-iii/firefly-iii/issues/7588) v1/recurrences not able to handle bills on
|
||||
Store & Update
|
||||
store & update
|
||||
- [Issue 7589](https://github.com/firefly-iii/firefly-iii/issues/7589) v1/recurrences fails when updating a split
|
||||
transaction
|
||||
|
||||
|
||||
@ -107,7 +107,7 @@ return [
|
||||
'webhooks' => true,
|
||||
'handle_debts' => true,
|
||||
],
|
||||
'version' => '6.0.12',
|
||||
'version' => '6.0.13',
|
||||
'api_version' => '2.0.4',
|
||||
'db_version' => 19,
|
||||
|
||||
|
||||
@ -338,7 +338,7 @@ page container: q-ma-xs (margin all, xs) AND q-mb-md to give the page content so
|
||||
<q-footer bordered class="bg-grey-8 text-white">
|
||||
<q-toolbar>
|
||||
<div>
|
||||
<small>Firefly III v v6.0.12 © James Cole, AGPL-3.0-or-later.</small>
|
||||
<small>Firefly III v v6.0.13 © James Cole, AGPL-3.0-or-later.</small>
|
||||
</div>
|
||||
</q-toolbar>
|
||||
</q-footer>
|
||||
|
||||
@ -1 +1 @@
|
||||
<!DOCTYPE html><html><head><base href=/v3/ ><title>Firefly III</title><meta charset=utf-8><meta content="Personal finances manager" name=description><meta content="telephone=no" name=format-detection><meta content=no name=msapplication-tap-highlight><meta content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width" name=viewport><link href=favicon-32x32.png rel=icon sizes=32x32 type=image/png><link href=favicon-16x16.png rel=icon sizes=16x16 type=image/png><link href=maskable76.png rel=apple-touch-icon sizes=76x76><link href=maskable120.png rel=apple-touch-icon sizes=120x120><link href=maskable152.png rel=apple-touch-icon sizes=152x152><link href=apple-touch-icon.png rel=apple-touch-icon sizes=180x180><link color=#3c8dbc href=safari-pinned-tab.svg rel=mask-icon><link href=maskable192.png rel=icon sizes=192x192><link href=maskable128.png rel=icon sizes=128x128><link href=manifest.webmanifest rel=manifest><meta content=#1e6581 name=msapplication-TileColor><meta content=maskable512.png name=msapplication-TileImage><meta content=no name=msapplication-tap-highlight><meta content="Firefly III" name=application-name><meta content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir" name=robots><meta content=yes name=apple-mobile-web-app-capable><meta content="Firefly III" name=apple-mobile-web-app-title><meta content="Firefly III" name=application-name><meta content=#3c8dbc name=msapplication-TileColor><meta content="mstile-144x144.png?v=3e8AboOwbd" name=msapplication-TileImage><meta content=#3c8dbc name=theme-color><script defer src=/v3/js/vendor.5b4ef590.js></script><script defer src=/v3/js/app.f3084ca9.js></script><link href=/v3/css/vendor.c7d74351.css rel=stylesheet><link href=/v3/css/app.50c7ba73.css rel=stylesheet></head><body><div id=q-app></div></body></html>
|
||||
<!DOCTYPE html><html><head><base href=/v3/ ><title>Firefly III</title><meta charset=utf-8><meta content="Personal finances manager" name=description><meta content="telephone=no" name=format-detection><meta content=no name=msapplication-tap-highlight><meta content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width" name=viewport><link href=favicon-32x32.png rel=icon sizes=32x32 type=image/png><link href=favicon-16x16.png rel=icon sizes=16x16 type=image/png><link href=maskable76.png rel=apple-touch-icon sizes=76x76><link href=maskable120.png rel=apple-touch-icon sizes=120x120><link href=maskable152.png rel=apple-touch-icon sizes=152x152><link href=apple-touch-icon.png rel=apple-touch-icon sizes=180x180><link color=#3c8dbc href=safari-pinned-tab.svg rel=mask-icon><link href=maskable192.png rel=icon sizes=192x192><link href=maskable128.png rel=icon sizes=128x128><link href=manifest.webmanifest rel=manifest><meta content=#1e6581 name=msapplication-TileColor><meta content=maskable512.png name=msapplication-TileImage><meta content=no name=msapplication-tap-highlight><meta content="Firefly III" name=application-name><meta content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir" name=robots><meta content=yes name=apple-mobile-web-app-capable><meta content="Firefly III" name=apple-mobile-web-app-title><meta content="Firefly III" name=application-name><meta content=#3c8dbc name=msapplication-TileColor><meta content="mstile-144x144.png?v=3e8AboOwbd" name=msapplication-TileImage><meta content=#3c8dbc name=theme-color><script defer src=/v3/js/vendor.5b4ef590.js></script><script defer src=/v3/js/app.67ae4d55.js></script><link href=/v3/css/vendor.c7d74351.css rel=stylesheet><link href=/v3/css/app.50c7ba73.css rel=stylesheet></head><body><div id=q-app></div></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -61,10 +61,10 @@ return [
|
||||
'invalid_selection' => 'Tu selección no es válida.',
|
||||
'belongs_user' => 'Este valor no es válido para este campo.',
|
||||
'at_least_one_transaction' => 'Se necesita al menos una transacción.',
|
||||
'recurring_transaction_id' => 'Need at least one transaction.',
|
||||
'need_id_to_match' => 'You need to submit this entry with an ID for the API to be able to match it.',
|
||||
'too_many_unmatched' => 'Too many submitted transactions cannot be matched to their respective database entries. Make sure existing entries have a valid ID.',
|
||||
'id_does_not_match' => 'Submitted ID #:id does not match expected ID. Make sure it matches or omit the field.',
|
||||
'recurring_transaction_id' => 'Se necesita al menos una transacción.',
|
||||
'need_id_to_match' => 'Necesitas registrar esta entrada con un ID para que la API pueda hacerla coincidir.',
|
||||
'too_many_unmatched' => 'Demasiadas transacciones registradas no se pueden hacer coincidir con sus respectivas entradas de la base de datos. Asegúrese de que las entradas existentes tienen un ID válido.',
|
||||
'id_does_not_match' => 'El ID #:id registrado no coincide con el ID esperado. Asegúrese de que coincide u omita el campo.',
|
||||
'at_least_one_repetition' => 'Se necesita al menos una repetición.',
|
||||
'require_repeat_until' => 'Se precisa un número de repeticiones o una fecha de finalización (repeat_until). No ambas.',
|
||||
'require_currency_info' => 'El contenido de este campo no es válido sin la información montearia.',
|
||||
|
||||
@ -61,10 +61,10 @@ return [
|
||||
'invalid_selection' => 'Twój wybór jest nieprawidłowy.',
|
||||
'belongs_user' => 'Ta wartość jest nieprawidłowa dla tego pola.',
|
||||
'at_least_one_transaction' => 'Wymaga co najmniej jednej transakcji.',
|
||||
'recurring_transaction_id' => 'Need at least one transaction.',
|
||||
'need_id_to_match' => 'You need to submit this entry with an ID for the API to be able to match it.',
|
||||
'too_many_unmatched' => 'Too many submitted transactions cannot be matched to their respective database entries. Make sure existing entries have a valid ID.',
|
||||
'id_does_not_match' => 'Submitted ID #:id does not match expected ID. Make sure it matches or omit the field.',
|
||||
'recurring_transaction_id' => 'Wymaga co najmniej jednej transakcji.',
|
||||
'need_id_to_match' => 'Musisz przesłać ten wpis z ID dla API, aby móc go dopasować.',
|
||||
'too_many_unmatched' => 'Zbyt wiele przesłanych transakcji nie może być dopasowanych do ich odpowiednich wpisów w bazie danych. Upewnij się, że istniejące wpisy mają poprawny ID.',
|
||||
'id_does_not_match' => 'Przesłane ID #:id nie pasuje do oczekiwanego ID. Upewnij się, że pasuje do pola lub pomiń to pole.',
|
||||
'at_least_one_repetition' => 'Wymaga co najmniej jednego powtórzenia.',
|
||||
'require_repeat_until' => 'Wymagana jest liczba powtórzeń lub data zakończenia (repeat_until), ale nie obie jednocześnie.',
|
||||
'require_currency_info' => 'Treść tego pola jest nieprawidłowa bez informacji o walucie.',
|
||||
|
||||
@ -61,9 +61,9 @@ return [
|
||||
'invalid_selection' => 'Вы сделали неправильный выбор.',
|
||||
'belongs_user' => 'Данное значение недопустимо для этого поля.',
|
||||
'at_least_one_transaction' => 'Необходима как минимум одна транзакция.',
|
||||
'recurring_transaction_id' => 'Need at least one transaction.',
|
||||
'recurring_transaction_id' => 'Необходима минимум одна транзакция.',
|
||||
'need_id_to_match' => 'You need to submit this entry with an ID for the API to be able to match it.',
|
||||
'too_many_unmatched' => 'Too many submitted transactions cannot be matched to their respective database entries. Make sure existing entries have a valid ID.',
|
||||
'too_many_unmatched' => 'Слишком много отправленных транзакций не могут быть сопоставлены с соответствующими записями в базе данных. Убедитесь, что существующие записи имеют правильный ID.',
|
||||
'id_does_not_match' => 'Submitted ID #:id does not match expected ID. Make sure it matches or omit the field.',
|
||||
'at_least_one_repetition' => 'Необходима как минимум одна транзакция.',
|
||||
'require_repeat_until' => 'Требуется либо несколько повторений, либо конечная дата (repeat_until). Но не оба параметра разом.',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user