From 33cf4896d8a1252aa83ee325a4ebbac35ac94b32 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 8 Oct 2020 19:28:21 -0700 Subject: [PATCH 1/7] Use password complexity rules on password reset --- .../Auth/ResetPasswordController.php | 38 +++++++++++++++++-- .../views/auth/passwords/reset.blade.php | 8 ++-- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index ac31e273cb..76f8db430a 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\Auth; use App\Http\Controllers\Controller; +use App\Models\Setting; use Illuminate\Foundation\Auth\ResetsPasswords; -use App\Models\User; use Illuminate\Http\Request; class ResetPasswordController extends Controller @@ -39,7 +39,39 @@ class ResetPasswordController extends Controller $this->middleware('guest'); } - + protected function rules() + { + return [ + 'token' => 'required', + 'username' => 'required', + 'password' => 'required|confirmed|'.Setting::passwordComplexityRulesSaving('update'), + ]; + } -} + protected function credentials(Request $request) + { + return $request->only( + 'username', 'password', 'password_confirmation', 'token' + ); + } + + + public function showResetForm(Request $request, $token = null) + { + return view('auth.passwords.reset')->with( + [ + 'token' => $token, + 'username' => $request->input('username') + ] + ); + } + + protected function sendResetFailedResponse(Request $request, $response) + { + return redirect()->back() + ->withInput(['username'=> $request->input('username')]) + ->withErrors(['username' => trans($response)]); + } + +} \ No newline at end of file diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 8935bc65e3..946b961a38 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -31,12 +31,12 @@ -
- +
+
- - {!! $errors->first('email', '') !!} + + {!! $errors->first('username', '') !!}
From 870b097f03888d55c584eb49bbc81911c702ff58 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 19 Oct 2020 17:49:56 -0700 Subject: [PATCH 2/7] Derp. Should be master --- config/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/version.php b/config/version.php index 6e72703d9a..3afe67268c 100644 --- a/config/version.php +++ b/config/version.php @@ -6,5 +6,5 @@ return array ( 'prerelease_version' => '', 'hash_version' => 'g33cf4896d', 'full_hash' => 'v5.0.0-1-g33cf4896d', - 'branch' => 'develop', + 'branch' => 'master', ); \ No newline at end of file From 5824ac3b28e349737b46475040c85f3f643b60b2 Mon Sep 17 00:00:00 2001 From: Folke Ashberg Date: Thu, 22 Oct 2020 14:22:42 +0200 Subject: [PATCH 3/7] Fix for #8580 Checking $asset->depreciation before calling $asset->depreciated_date() --- app/Http/Controllers/ReportsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index fdb7e064cf..41c805f18d 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -682,7 +682,7 @@ class ReportsController extends Controller $diff = ($asset->purchase_cost - $depreciation); $row[] = Helper::formatCurrencyOutput($depreciation); $row[] = Helper::formatCurrencyOutput($diff); - $row[] = ($asset->depreciated_date()!='') ? $asset->depreciated_date()->format('Y-m-d') : ''; + $row[] = ($asset->depreciation ? $asset->depreciated_date()->format('Y-m-d') : ''; } if ($request->filled('checkout_date')) { From 377c92a29030414fda2461d0ccdba23d1900a031 Mon Sep 17 00:00:00 2001 From: Folke Ashberg Date: Thu, 22 Oct 2020 14:33:24 +0200 Subject: [PATCH 4/7] update --- app/Http/Controllers/ReportsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 41c805f18d..eb15ca3ace 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -682,7 +682,7 @@ class ReportsController extends Controller $diff = ($asset->purchase_cost - $depreciation); $row[] = Helper::formatCurrencyOutput($depreciation); $row[] = Helper::formatCurrencyOutput($diff); - $row[] = ($asset->depreciation ? $asset->depreciated_date()->format('Y-m-d') : ''; + $row[] = ($asset->depreciation) ? $asset->depreciated_date()->format('Y-m-d') : ''; } if ($request->filled('checkout_date')) { From fcdb945f5f3d1a154bdd0c9f78198f3233dcd24c Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 22 Oct 2020 09:21:18 -0700 Subject: [PATCH 5/7] reworded the ad_append_domain_help string --- resources/lang/en/admin/settings/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index 6de059ba7e..d9a62aedbb 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -6,7 +6,7 @@ return array( 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_append_domain_label' => 'Append domain name', 'ad_append_domain' => 'Append domain name to username field', - 'ad_append_domain_help' => 'User doesn\'t require to write "username@domain.local", they can just type "username".' , + 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' , 'admin_cc_email' => 'CC Email', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'is_ad' => 'This is an Active Directory server', From 9f4a212b444e4ee80e23d361f3d4a93e47f66a3d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 3 Nov 2020 11:47:58 -0800 Subject: [PATCH 6/7] Bumped hash --- config/version.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/version.php b/config/version.php index cecf8f69be..e5d87281a9 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v5.0.4', - 'full_app_version' => 'v5.0.4 - build 5452-gc93f4ef0d', - 'build_version' => '5452', + 'app_version' => 'v5.0.5-pre', + 'full_app_version' => 'v5.0.5-pre - build 5457-', + 'build_version' => '5457', 'prerelease_version' => '', - 'hash_version' => 'gc93f4ef0d', - 'full_hash' => 'v5.0.4-7-gc93f4ef0d', + 'hash_version' => '', + 'full_hash' => 'v5.0.5-pre', 'branch' => 'master', ); \ No newline at end of file From 911841d1888981fc6f7f376157c0c1693716934d Mon Sep 17 00:00:00 2001 From: Matthew Zackschewski Date: Tue, 3 Nov 2020 16:40:43 -0500 Subject: [PATCH 7/7] Re-Added Accessories API #8312 #8624 Removed unnecessary duplicate licenses endpoint and re-added the user accessories endpoint which was left off. --- routes/api.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routes/api.php b/routes/api.php index e631b98352..569b9533f8 100644 --- a/routes/api.php +++ b/routes/api.php @@ -808,10 +808,10 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api'] ); - Route::get('{user}/licenses', + Route::get('{user}/accessories', [ - 'as' => 'api.users.licenselist', - 'uses' => 'UsersController@licenses' + 'as' => 'api.users.accessorieslist', + 'uses' => 'UsersController@accessories' ] );