From c6726015f78a5749a39942ae7fad3873419be21b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 30 Apr 2021 14:52:08 -0700
Subject: [PATCH 01/12] Added missing use statement

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/LocationsController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index 4f07cb05d5..7a112656d4 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -6,6 +6,7 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Location;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
+use App\Models\Asset;
 use Illuminate\Support\Facades\Storage;
 
 /**

From cee5eea12120a9da9828d63e130ab6b666539244 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 30 Apr 2021 15:37:39 -0700
Subject: [PATCH 02/12] Use 24-hour date format for audit

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Assets/AssetsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 12c5f06949..8fed678d40 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -813,7 +813,7 @@ class AssetsController extends Controller
         $asset->unsetEventDispatcher();
 
         $asset->next_audit_date = $request->input('next_audit_date');
-        $asset->last_audit_date = date('Y-m-d h:i:s');
+        $asset->last_audit_date = date('Y-m-d H:i:s');
 
         // Check to see if they checked the box to update the physical location,
         // not just note it in the audit notes

From 57b9b571dcaa54a27127882052c5069c1276ddc6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 4 May 2021 22:00:34 -0700
Subject: [PATCH 03/12] Fixed #9531 - highlight search box when filled, add
 clear button (#9534)

---
 public/css/dist/skins/skin-black-dark.css     | Bin 12041 -> 12117 bytes
 public/css/dist/skins/skin-black-dark.min.css | Bin 12041 -> 12117 bytes
 public/css/dist/skins/skin-black.css          | Bin 4304 -> 4380 bytes
 public/css/dist/skins/skin-black.min.css      | Bin 4304 -> 4380 bytes
 public/css/dist/skins/skin-blue-dark.css      | Bin 11617 -> 11693 bytes
 public/css/dist/skins/skin-blue-dark.min.css  | Bin 11617 -> 11693 bytes
 public/css/dist/skins/skin-blue.css           | Bin 4593 -> 4669 bytes
 public/css/dist/skins/skin-blue.min.css       | Bin 4593 -> 4669 bytes
 public/css/dist/skins/skin-contrast.css       | Bin 5178 -> 5254 bytes
 public/css/dist/skins/skin-contrast.min.css   | Bin 5178 -> 5254 bytes
 public/css/dist/skins/skin-green-dark.css     | Bin 11663 -> 11739 bytes
 public/css/dist/skins/skin-green-dark.min.css | Bin 11663 -> 11739 bytes
 public/css/dist/skins/skin-green.css          | Bin 4186 -> 4262 bytes
 public/css/dist/skins/skin-green.min.css      | Bin 4186 -> 4262 bytes
 public/css/dist/skins/skin-orange-dark.css    | Bin 11772 -> 11848 bytes
 .../css/dist/skins/skin-orange-dark.min.css   | Bin 11772 -> 11848 bytes
 public/css/dist/skins/skin-orange.css         | Bin 4229 -> 4305 bytes
 public/css/dist/skins/skin-orange.min.css     | Bin 4229 -> 4305 bytes
 public/css/dist/skins/skin-purple-dark.css    | Bin 11770 -> 11846 bytes
 .../css/dist/skins/skin-purple-dark.min.css   | Bin 11770 -> 11846 bytes
 public/css/dist/skins/skin-purple.css         | Bin 4229 -> 4305 bytes
 public/css/dist/skins/skin-purple.min.css     | Bin 4229 -> 4305 bytes
 public/css/dist/skins/skin-red-dark.css       | Bin 11585 -> 11661 bytes
 public/css/dist/skins/skin-red-dark.min.css   | Bin 11585 -> 11661 bytes
 public/css/dist/skins/skin-red.css            | Bin 4100 -> 4176 bytes
 public/css/dist/skins/skin-red.min.css        | Bin 4100 -> 4176 bytes
 public/css/dist/skins/skin-yellow-dark.css    | Bin 11703 -> 11779 bytes
 .../css/dist/skins/skin-yellow-dark.min.css   | Bin 11703 -> 11779 bytes
 public/css/dist/skins/skin-yellow.css         | Bin 4229 -> 4305 bytes
 public/css/dist/skins/skin-yellow.min.css     | Bin 4229 -> 4305 bytes
 public/mix-manifest.json                      |  60 +++++++++---------
 .../assets/less/skins/skin-black-dark.less    |   3 +
 resources/assets/less/skins/skin-black.less   |   4 ++
 .../assets/less/skins/skin-blue-dark.less     |   3 +
 resources/assets/less/skins/skin-blue.less    |   4 ++
 .../assets/less/skins/skin-contrast.less      |   4 ++
 .../assets/less/skins/skin-green-dark.less    |   4 ++
 resources/assets/less/skins/skin-green.less   |   4 ++
 .../assets/less/skins/skin-orange-dark.less   |   3 +
 resources/assets/less/skins/skin-orange.less  |   4 ++
 .../assets/less/skins/skin-purple-dark.less   |   3 +
 resources/assets/less/skins/skin-purple.less  |   3 +
 .../assets/less/skins/skin-red-dark.less      |   3 +
 resources/assets/less/skins/skin-red.less     |   4 ++
 .../assets/less/skins/skin-yellow-dark.less   |   3 +
 resources/assets/less/skins/skin-yellow.less  |   4 ++
 .../views/partials/bootstrap-table.blade.php  |  41 ++++++++++--
 47 files changed, 118 insertions(+), 36 deletions(-)

diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css
index d0127ff92d926cc42b70e48535b95e9bab7f6f32..fe37f7bfbd59490efd0fc84dfbbf1f014abfb740 100644
GIT binary patch
delta 60
zcmeB-yBfEFQ(r}|I5n{-IYT!iGd&{*h)Z<1FoY&6YRPgdr&^{MnkHFu)p7v<n_Cnv

delta 7
OcmcZ_*BQ5gQy%~hgaZQr

diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css
index d0127ff92d926cc42b70e48535b95e9bab7f6f32..fe37f7bfbd59490efd0fc84dfbbf1f014abfb740 100644
GIT binary patch
delta 60
zcmeB-yBfEFQ(r}|I5n{-IYT!iGd&{*h)Z<1FoY&6YRPgdr&^{MnkHFu)p7v<n_Cnv

delta 7
OcmcZ_*BQ5gQy%~hgaZQr

diff --git a/public/css/dist/skins/skin-black.css b/public/css/dist/skins/skin-black.css
index d877413b62de8636c70d2ea0f59d851c0afe1465..d451cf664cd922a28451e75f44f9a9936146b8c1 100644
GIT binary patch
delta 65
zcmcbhI7ey21pzI+;?%^V<P6=6%=C;LATH72!Vt2`$S+GRn!Hg!f-BWB#n3d#nyZ!z
E04t~$8~^|S

delta 7
OcmbQEbU|^$1pxpJYXd+4

diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css
index d877413b62de8636c70d2ea0f59d851c0afe1465..d451cf664cd922a28451e75f44f9a9936146b8c1 100644
GIT binary patch
delta 65
zcmcbhI7ey21pzI+;?%^V<P6=6%=C;LATH72!Vt2`$S+GRn!Hg!f-BWB#n3d#nyZ!z
E04t~$8~^|S

delta 7
OcmbQEbU|^$1pxpJYXd+4

diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css
index f39f87cd1672ac06010110eec085b823f9ab4cb0..354b6a044aaa360395a0002bc095c930ed7bca7a 100644
GIT binary patch
delta 64
zcmaDDwKjS~qOOKsacW{wa)xe3W_m^r5SQq1VF+1e<d;qUC@#sZoNAe3XqsfrRm%kc
DBT*Ld

delta 7
OcmZ1*{V-}nqAmarumges

diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
index f39f87cd1672ac06010110eec085b823f9ab4cb0..354b6a044aaa360395a0002bc095c930ed7bca7a 100644
GIT binary patch
delta 64
zcmaDDwKjS~qOOKsacW{wa)xe3W_m^r5SQq1VF+1e<d;qUC@#sZoNAe3XqsfrRm%kc
DBT*Ld

delta 7
OcmZ1*{V-}nqAmarumges

diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css
index 764cc18fca2d9b825ae996d708eff8c160e222e7..c6e206ce8160f57d8af672cf30b9f9969c197ffb 100644
GIT binary patch
delta 59
ycmeyUyjNwzM?n?6;?%^V<P6=6%=C;LATH72!VsFA&n(B4YMEkanq<vY%LM?f`xMsz

delta 7
Ocmdn1@=<xiM?nA&P6Ma_

diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css
index 764cc18fca2d9b825ae996d708eff8c160e222e7..c6e206ce8160f57d8af672cf30b9f9969c197ffb 100644
GIT binary patch
delta 59
ycmeyUyjNwzM?n?6;?%^V<P6=6%=C;LATH72!VsFA&n(B4YMEkanq<vY%LM?f`xMsz

delta 7
Ocmdn1@=<xiM?nA&P6Ma_

diff --git a/public/css/dist/skins/skin-contrast.css b/public/css/dist/skins/skin-contrast.css
index 7a36625af625cae6d8d8df3db460b972a65912ef..35bf9fd0c9be44c697447e01bada03a153e497ac 100644
GIT binary patch
delta 59
ycmdm`(Wbe<N<>AkI5n{-IYT!iGd&{*h)Z<1FoY&g<dfq{wM;QIO|s^y<pKb6xfARF

delta 7
OcmZqE+@-O>N(2B4fdY^K

diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css
index 7a36625af625cae6d8d8df3db460b972a65912ef..35bf9fd0c9be44c697447e01bada03a153e497ac 100644
GIT binary patch
delta 59
ycmdm`(Wbe<N<>AkI5n{-IYT!iGd&{*h)Z<1FoY&g<dfq{wM;QIO|s^y<pKb6xfARF

delta 7
OcmZqE+@-O>N(2B4fdY^K

diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css
index de6a20c4ed6f66a5cca248969238842f40032812..77d62688327fe36d784b217166b32e07c8a3c60e 100644
GIT binary patch
delta 60
zcmeB=z8$@xUspx1I5n{-IYT!iGd&{*h)Z<1FoY&I%E)pnr&^{MnkHFu)p7v<z5Nvm

delta 7
OcmcZ|-5<T7Ul#xmxC4y<

diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
index de6a20c4ed6f66a5cca248969238842f40032812..77d62688327fe36d784b217166b32e07c8a3c60e 100644
GIT binary patch
delta 60
zcmeB=z8$@xUspx1I5n{-IYT!iGd&{*h)Z<1FoY&I%E)pnr&^{MnkHFu)p7v<z5Nvm

delta 7
OcmcZ|-5<T7Ul#xmxC4y<

diff --git a/public/css/dist/skins/skin-green.css b/public/css/dist/skins/skin-green.css
index 14b31933559573f3a66d22b101cf17084891edf0..e7cef037dc38524e37f7ec8f1d1012258438458d 100644
GIT binary patch
delta 59
ycmcbmuuO47lz@s}acW{wa)xe3W_m^r5SQq1VF*nY;FIG@wM;QIO|s^y<pKbGhZDB|

delta 7
OcmZ3ccuQeJlmGw>?E>5Y

diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css
index 14b31933559573f3a66d22b101cf17084891edf0..e7cef037dc38524e37f7ec8f1d1012258438458d 100644
GIT binary patch
delta 59
ycmcbmuuO47lz@s}acW{wa)xe3W_m^r5SQq1VF*nY;FIG@wM;QIO|s^y<pKbGhZDB|

delta 7
OcmZ3ccuQeJlmGw>?E>5Y

diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css
index c3d2bfaaa65c0697c7f4cf51480ab377e61d623f..b2b7a88bde8449c01a4456209fd818090409a951 100644
GIT binary patch
delta 58
xcmewpeIjPVA6*r_;?%^V<P6=6%=C;LATH72!VsE#ky)P8GR4p|$(pN{3jo3(6@dT%

delta 7
OcmX>R^Cx=4A6)<vGz3)u

diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
index c3d2bfaaa65c0697c7f4cf51480ab377e61d623f..b2b7a88bde8449c01a4456209fd818090409a951 100644
GIT binary patch
delta 58
xcmewpeIjPVA6*r_;?%^V<P6=6%=C;LATH72!VsE#ky)P8GR4p|$(pN{3jo3(6@dT%

delta 7
OcmX>R^Cx=4A6)<vGz3)u

diff --git a/public/css/dist/skins/skin-orange.css b/public/css/dist/skins/skin-orange.css
index ba4201ebe68273d2a021dfc598e8ddfb9b7e097e..8967ee49640953bc1c1d4a2ef2ecbe6eab74c983 100644
GIT binary patch
delta 58
xcmZowyr{ULRX|0rI5n{-IYT!iGd&{*h)Z<1FoY&|Gs|;YrWl$gS##BL0RU}w6T|=j

delta 7
Ocmcbp*s8dpRR91C%L3j2

diff --git a/public/css/dist/skins/skin-orange.min.css b/public/css/dist/skins/skin-orange.min.css
index ba4201ebe68273d2a021dfc598e8ddfb9b7e097e..8967ee49640953bc1c1d4a2ef2ecbe6eab74c983 100644
GIT binary patch
delta 58
xcmZowyr{ULRX|0rI5n{-IYT!iGd&{*h)Z<1FoY&|Gs|;YrWl$gS##BL0RU}w6T|=j

delta 7
Ocmcbp*s8dpRR91C%L3j2

diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css
index 036868245bb336ab7d48082448b5f89f18db8cad..e2b5e31e06da5a2be04a3f0c1c2089e532ee73c9 100644
GIT binary patch
delta 59
ycmewreJp0fFI^SA;?%^V<P6=6%=C;LATH72!VsE#ky(x_)iTA<G|8H)mJ0yb4He)3

delta 7
OcmX>W^DBD8FI@l<7z9rM

diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
index 036868245bb336ab7d48082448b5f89f18db8cad..e2b5e31e06da5a2be04a3f0c1c2089e532ee73c9 100644
GIT binary patch
delta 59
ycmewreJp0fFI^SA;?%^V<P6=6%=C;LATH72!VsE#ky(x_)iTA<G|8H)mJ0yb4He)3

delta 7
OcmX>W^DBD8FI@l<7z9rM

diff --git a/public/css/dist/skins/skin-purple.css b/public/css/dist/skins/skin-purple.css
index 2bf4309d1e25318832e5a29f71095a3f480f6d81..d046db972a77a8acb8a11b706d7af320b291db8a 100644
GIT binary patch
delta 59
ycmZowyr{ULRX|0rI5n{-IYT!iGd&{*h)Z<1FoY&|Gs|(MTBaD9CRuaUasdE>`V=Vu

delta 7
Ocmcbp*s8dpRR91C%L3j2

diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css
index 2bf4309d1e25318832e5a29f71095a3f480f6d81..d046db972a77a8acb8a11b706d7af320b291db8a 100644
GIT binary patch
delta 59
ycmZowyr{ULRX|0rI5n{-IYT!iGd&{*h)Z<1FoY&|Gs|(MTBaD9CRuaUasdE>`V=Vu

delta 7
Ocmcbp*s8dpRR91C%L3j2

diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css
index 8f28047641945e25507213cde951e2d27fff9085..8a6b85e25607af76ca2434b25985b75c0ab3477a 100644
GIT binary patch
delta 59
ycmX>Y)f>IRQCCH;I5n{-IYT!iGd&{*h)Z<1FoY&=;Fse{wM;QIO|s^y<pKbej})E&

delta 7
OcmeB;J{YyZQ5OIW@B<<M

diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
index 8f28047641945e25507213cde951e2d27fff9085..8a6b85e25607af76ca2434b25985b75c0ab3477a 100644
GIT binary patch
delta 59
ycmX>Y)f>IRQCCH;I5n{-IYT!iGd&{*h)Z<1FoY&=;Fse{wM;QIO|s^y<pKbej})E&

delta 7
OcmeB;J{YyZQ5OIW@B<<M

diff --git a/public/css/dist/skins/skin-red.css b/public/css/dist/skins/skin-red.css
index 2c327681680d01f9692fe60cfd62bab01f36e9a2..71762b3d1f9292aa2382a1b0de9d6b93270583ce 100644
GIT binary patch
delta 59
ycmZosxS+6sML<QbI5n{-IYT!iGd&{*h)Z<1FoY&2GRtwLTBaD9CRuaUasdEjk`sCW

delta 7
Ocmcbh(4w$`MF0Q`vjSNF

diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css
index 2c327681680d01f9692fe60cfd62bab01f36e9a2..71762b3d1f9292aa2382a1b0de9d6b93270583ce 100644
GIT binary patch
delta 59
ycmZosxS+6sML<QbI5n{-IYT!iGd&{*h)Z<1FoY&2GRtwLTBaD9CRuaUasdEjk`sCW

delta 7
Ocmcbh(4w$`MF0Q`vjSNF

diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css
index 1d86aff95646739db717f16c1ccb637d088639fe..b59bef009ac72a8ff8d70956fab395f1d702b265 100644
GIT binary patch
delta 58
xcmdlU-5j%FyRM2}acW{wa)xe3W_m^r5SQq1VF*pW$SluknPO;~WX)B}1pt*D6tVyS

delta 7
OcmZpU*&e-NyDk6@ZUcq@

diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
index 1d86aff95646739db717f16c1ccb637d088639fe..b59bef009ac72a8ff8d70956fab395f1d702b265 100644
GIT binary patch
delta 58
xcmdlU-5j%FyRM2}acW{wa)xe3W_m^r5SQq1VF*pW$SluknPO;~WX)B}1pt*D6tVyS

delta 7
OcmZpU*&e-NyDk6@ZUcq@

diff --git a/public/css/dist/skins/skin-yellow.css b/public/css/dist/skins/skin-yellow.css
index b8e36d0693adf0a8548b62a39212667a875f6d17..673bf1a9f1d1ea90b27508a00111c4ab38effded 100644
GIT binary patch
delta 58
xcmZowyr{ULRX|0rI5n{-IYT!iGd&{*h)Z<1FoY&|Gs|;YrWl$gS##BL0RU}w6T|=j

delta 7
Ocmcbp*s8dpRR91C%L3j2

diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css
index b8e36d0693adf0a8548b62a39212667a875f6d17..673bf1a9f1d1ea90b27508a00111c4ab38effded 100644
GIT binary patch
delta 58
xcmZowyr{ULRX|0rI5n{-IYT!iGd&{*h)Z<1FoY&|Gs|;YrWl$gS##BL0RU}w6T|=j

delta 7
Ocmcbp*s8dpRR91C%L3j2

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index b8f5625808..b62c0b576a 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -3,21 +3,21 @@
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=5d8ce6b758f170008cd6",
     "/css/build/app.css": "/css/build/app.css?id=9b6ddbece1a3cfc99036",
     "/css/build/overrides.css": "/css/build/overrides.css?id=0a65220cdae6fbb6d913",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a5c05d669800b5f5afa1",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=1d5974e034b61b5795ec",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=cf23e72b9c963c5ab23a",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=76d0cc15e24e6a03fd2f",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=6843dc80c6b201c4a7db",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=d3c953fe66305cef3b54",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=97d81897063e94094a2a",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=679ab6aeba9c278a9051",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=56d008e86c006d37bc23",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=915206c9df022fc5037a",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=2b17e31c820ef66db5a1",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ccdd91178df4c10811e9",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=928bfe8035be1497e83b",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=539f691ddc970f867c49",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=4bf9e22405edb2dc2b76",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=e57a7bb77ae1fb640331",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=fdb6630b38435c84c7d2",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=5d582ce5e98f591b8c65",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=02e8563844e00840e01c",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=4daaa0e353849ff8cacf",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=c89047b28b272bc07e81",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=9f9013a3ec06e256e1dc",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=5b4937fd36d26f7a92e3",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=e6239abc2a7a28441911",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=85ef26204fbc8b2dad5b",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=84667fc9b0f00d11a9c4",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=8e774a0e5435527d63c4",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=5269656828cfba157e92",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=0a4ddc28e3a8228cc11e",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b22dc3561eda3d2027a9",
     "/css/dist/all.css": "/css/dist/all.css?id=fc64989106daf3be016b",
     "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
     "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
@@ -27,19 +27,19 @@
     "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=fd6e727609678bf04984",
     "/js/dist/all.js": "/js/dist/all.js?id=d0fbb4953b84b70787d4",
-    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=76d0cc15e24e6a03fd2f",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6843dc80c6b201c4a7db",
-    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=d3c953fe66305cef3b54",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=97d81897063e94094a2a",
-    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=a5c05d669800b5f5afa1",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=928bfe8035be1497e83b",
-    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=2b17e31c820ef66db5a1",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=ccdd91178df4c10811e9",
-    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=1d5974e034b61b5795ec",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=679ab6aeba9c278a9051",
-    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=56d008e86c006d37bc23",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=915206c9df022fc5037a",
-    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=4bf9e22405edb2dc2b76",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=539f691ddc970f867c49",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=cf23e72b9c963c5ab23a"
+    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=02e8563844e00840e01c",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=4daaa0e353849ff8cacf",
+    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=c89047b28b272bc07e81",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=9f9013a3ec06e256e1dc",
+    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=e57a7bb77ae1fb640331",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=5269656828cfba157e92",
+    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=84667fc9b0f00d11a9c4",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=8e774a0e5435527d63c4",
+    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=fdb6630b38435c84c7d2",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=5b4937fd36d26f7a92e3",
+    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=e6239abc2a7a28441911",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=85ef26204fbc8b2dad5b",
+    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=b22dc3561eda3d2027a9",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=0a4ddc28e3a8228cc11e",
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=5d582ce5e98f591b8c65"
 }
diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less
index aa3c1d3c22..bc99522b4d 100644
--- a/resources/assets/less/skins/skin-black-dark.less
+++ b/resources/assets/less/skins/skin-black-dark.less
@@ -403,3 +403,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-black.less b/resources/assets/less/skins/skin-black.less
index 7dfb525340..b1660b26b4 100755
--- a/resources/assets/less/skins/skin-black.less
+++ b/resources/assets/less/skins/skin-black.less
@@ -108,4 +108,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @black;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less
index e387a54b5b..aca5b7f4ab 100644
--- a/resources/assets/less/skins/skin-blue-dark.less
+++ b/resources/assets/less/skins/skin-blue-dark.less
@@ -392,3 +392,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less
index 1268415f53..1644faeaa1 100755
--- a/resources/assets/less/skins/skin-blue.less
+++ b/resources/assets/less/skins/skin-blue.less
@@ -120,4 +120,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: #3c8dbc;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-contrast.less b/resources/assets/less/skins/skin-contrast.less
index bca355c52e..f66e76676b 100644
--- a/resources/assets/less/skins/skin-contrast.less
+++ b/resources/assets/less/skins/skin-contrast.less
@@ -168,4 +168,8 @@ input::-ms-input-placeholder { /* IE 10+ */
 
 .fixed-table-container tbody .selected td {
   background-color: #fff8af;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less
index 315fe3ba0f..41f2c69f5c 100644
--- a/resources/assets/less/skins/skin-green-dark.less
+++ b/resources/assets/less/skins/skin-green-dark.less
@@ -392,3 +392,7 @@ a {
   display: table-cell;
 }
 
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-green.less b/resources/assets/less/skins/skin-green.less
index d8fcf84033..0c0a9bdbc3 100755
--- a/resources/assets/less/skins/skin-green.less
+++ b/resources/assets/less/skins/skin-green.less
@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @green;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less
index 148a779031..78e2ab64e0 100644
--- a/resources/assets/less/skins/skin-orange-dark.less
+++ b/resources/assets/less/skins/skin-orange-dark.less
@@ -394,3 +394,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-orange.less b/resources/assets/less/skins/skin-orange.less
index 1884b66d0c..fb66309249 100644
--- a/resources/assets/less/skins/skin-orange.less
+++ b/resources/assets/less/skins/skin-orange.less
@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @orange;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less
index 112ae19e9d..97498c7aaa 100644
--- a/resources/assets/less/skins/skin-purple-dark.less
+++ b/resources/assets/less/skins/skin-purple-dark.less
@@ -394,3 +394,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-purple.less b/resources/assets/less/skins/skin-purple.less
index 294839e431..4c4accd594 100755
--- a/resources/assets/less/skins/skin-purple.less
+++ b/resources/assets/less/skins/skin-purple.less
@@ -108,3 +108,6 @@ a {
   background-color: @purple;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less
index 405e14f13f..59705c163b 100644
--- a/resources/assets/less/skins/skin-red-dark.less
+++ b/resources/assets/less/skins/skin-red-dark.less
@@ -393,3 +393,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-red.less b/resources/assets/less/skins/skin-red.less
index 3aab107e43..e53f812c5b 100755
--- a/resources/assets/less/skins/skin-red.less
+++ b/resources/assets/less/skins/skin-red.less
@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @red;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less
index b01d89283b..c123340b96 100644
--- a/resources/assets/less/skins/skin-yellow-dark.less
+++ b/resources/assets/less/skins/skin-yellow-dark.less
@@ -391,3 +391,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
diff --git a/resources/assets/less/skins/skin-yellow.less b/resources/assets/less/skins/skin-yellow.less
index fadb5824f5..c6ecc5c7bf 100755
--- a/resources/assets/less/skins/skin-yellow.less
+++ b/resources/assets/less/skins/skin-yellow.less
@@ -106,3 +106,7 @@ a {
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @yellow;
 }
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index a458d3c8aa..13de846d39 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -1,13 +1,15 @@
 @push('css')
 <link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
+
 @endpush
 
 @push('js')
-<script src="{{ asset(mix('js/dist/bootstrap-table.js')) }}"></script>
+<script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
 <script nonce="{{ csrf_token() }}">
 
     $(function () {
 
+
         var stickyHeaderOffsetY = 0;
 
         if ( $('.navbar-fixed-top').css('height') ) {
@@ -21,7 +23,7 @@
 
         var keyBlocked = function(key) {
             for(var j in blockedFields) {
-                if(key === blockedFields[j]) {
+                if (key === blockedFields[j]) {
                     return true;
                 }
             }
@@ -44,6 +46,7 @@
             mobileResponsive: true,
             maintainSelected: true,
             trimOnSearch: false,
+            showSearchClearButton: true,
             paginationFirstText: "{{ trans('general.first') }}",
             paginationLastText: "{{ trans('general.last') }}",
             paginationPreText: "{{ trans('general.previous') }}",
@@ -69,12 +72,14 @@
                 paginationSwitchUp: 'fa-caret-square-o-up',
                 columns: 'fa-columns',
                 refresh: 'fa-refresh',
-                export: 'fa-download'
+                export: 'fa-download',
+                clearSearch: 'fa-times'
             },
             exportTypes: ['csv', 'excel', 'doc', 'txt','json', 'xml', 'pdf'],
             onLoadSuccess: function () {
-                $('[data-toggle="tooltip"]').tooltip(); // Need to attach tooltips after ajax call
+                $('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call
             }
+
         });
     });
 
@@ -621,13 +626,37 @@
     });
 
 
-    // This is necessary to make the bootstrap tooltips work inside of the
-    // wenzhixin/bootstrap-table formatters
+
     $(function() {
+
+        // This handles the search box highlighting on both ajax and client-side
+        // bootstrap tables
+        var searchboxHighlighter = function (event) {
+
+            $('.search-input').each(function (index, element) {
+
+                if ($(element).val() != '') {
+                    $(element).addClass('search-highlight');
+                    $(element).next().children().addClass('search-highlight');
+                } else {
+                    $(element).removeClass('search-highlight');
+                    $(element).next().children().removeClass('search-highlight');
+                }
+            });
+        };
+
+        $('.search button[name=clearSearch]').click(searchboxHighlighter);
+        searchboxHighlighter({ name:'pageload'});
+        $('.search-input').keyup(searchboxHighlighter);
+
+        //  This is necessary to make the bootstrap tooltips work inside of the
+        // wenzhixin/bootstrap-table formatters
         $('#table').on('post-body.bs.table', function () {
             $('[data-toggle="tooltip"]').tooltip({
                 container: 'body'
             });
+
+
         });
     });
 

From a6bbe1fec3dc245cd7734f1daf56ebc30d4f36eb Mon Sep 17 00:00:00 2001
From: Tom Misilo <1446856+misilot@users.noreply.github.com>
Date: Wed, 5 May 2021 00:18:22 -0500
Subject: [PATCH 04/12] Delete file from assets folder, not just the ref.
 (#9525)

---
 app/Http/Controllers/Assets/AssetFilesController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php
index 28aa3097c5..7cdd075ab9 100644
--- a/app/Http/Controllers/Assets/AssetFilesController.php
+++ b/app/Http/Controllers/Assets/AssetFilesController.php
@@ -110,15 +110,15 @@ class AssetFilesController extends Controller
     {
         $asset = Asset::find($assetId);
         $this->authorize('update', $asset);
-        $rel_path = 'storage/private_uploads/assets';
+        $rel_path = 'private_uploads/assets';
 
         // the asset is valid
         if (isset($asset->id)) {
             $this->authorize('update', $asset);
             $log = Actionlog::find($fileId);
             if ($log) {
-            if (file_exists(base_path().'/'.$rel_path.'/'.$log->filename)) {
-                Storage::disk('public')->delete($rel_path.'/'.$log->filename);
+            if (Storage::exists($rel_path.'/'.$log->filename)) {
+                Storage::delete($rel_path.'/'.$log->filename);
                 }
                 $log->delete();
                 return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));

From 715b1a0fb26fdefd3222bc900c03312a7ffd26f7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 4 May 2021 22:20:54 -0700
Subject: [PATCH 05/12] Fixed #9157 Update .env to
 API_TOKEN_EXPIRATION_YEARS=15 (reapplies #9524)

Signed-off-by: snipe <snipe@snipe.net>
---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index b4b173414a..31e3cca14b 100644
--- a/.env.example
+++ b/.env.example
@@ -77,7 +77,7 @@ ENCRYPT=false
 COOKIE_NAME=snipeit_session
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
-API_TOKEN_EXPIRATION_YEARS=40
+API_TOKEN_EXPIRATION_YEARS=15
 
 # --------------------------------------------
 # OPTIONAL: SECURITY HEADER SETTINGS

From 6c0af3c6e1076bab99b39d633dd530ac62c949a4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 4 May 2021 22:21:18 -0700
Subject: [PATCH 06/12] Add @JohnnyPicnic as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 2cfb30015d..00e557cd48 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2306,6 +2306,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "JohnnyPicnic",
+      "name": "JohnnyPicnic",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5553884?v=4",
+      "profile": "https://github.com/JohnnyPicnic",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index 696384fd5f..efcd8f69e2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-253-orange.svg?style=flat-square)](#contributors) 
+[![All Contributors](https://img.shields.io/badge/all_contributors-254-orange.svg?style=flat-square)](#contributors) 
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -125,7 +125,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http://david.davenne.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [<img src="https://avatars.githubusercontent.com/u/13993216?v=4" width="110px;"/><br /><sub>Joly0</sub>](https://github.com/Joly0)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>theburger</sub>](https://github.com/limeless)<br />[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

From 6c1553167d2e62c998c6ff56ae4a920c8c747f4a Mon Sep 17 00:00:00 2001
From: markbrule <markbrule@users.noreply.github.com>
Date: Tue, 4 May 2021 22:27:01 -0700
Subject: [PATCH 07/12] issue #9422 - pivot ID was being used as a user_id
 (#9512)

---
 app/Http/Controllers/Api/AccessoriesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index f27d48c7c8..edbf90d15c 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -287,7 +287,7 @@ class AccessoriesController extends Controller
         $accessory = Accessory::find($accessory_user->accessory_id);
         $this->authorize('checkin', $accessory);
 
-        $logaction = $accessory->logCheckin(User::find($accessoryUserId), $request->input('note'));
+        $logaction = $accessory->logCheckin(User::find($accessory_user->user_id), $request->input('note'));
 
         // Was the accessory updated?
         if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {

From c1a8b609ea99725e409f6cd9b29398a165016040 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 4 May 2021 22:27:35 -0700
Subject: [PATCH 08/12] Add @markbrule as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 00e557cd48..73d95cce64 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2315,6 +2315,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "markbrule",
+      "name": "markbrule",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8799594?v=4",
+      "profile": "https://github.com/markbrule",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index efcd8f69e2..60652e25d1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-254-orange.svg?style=flat-square)](#contributors) 
+[![All Contributors](https://img.shields.io/badge/all_contributors-255-orange.svg?style=flat-square)](#contributors) 
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -125,7 +125,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http://david.davenne.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [<img src="https://avatars.githubusercontent.com/u/13993216?v=4" width="110px;"/><br /><sub>Joly0</sub>](https://github.com/Joly0)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>theburger</sub>](https://github.com/limeless)<br />[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

From 37f7768e7a69d65f6c7cc3145477a01789622aa0 Mon Sep 17 00:00:00 2001
From: Dampfklon <me@dampfklon.de>
Date: Wed, 5 May 2021 07:29:24 +0200
Subject: [PATCH 09/12] Fix Dockerfile.alpine build error and snipeit runtime
 permission error (#9520)

---
 Dockerfile.alpine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 24a7c3d1f9..64cac8df22 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -57,7 +57,7 @@ RUN \
     && mkdir -p "/var/lib/snipeit/dumps" && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \
     && mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
     && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
-    && chown -h "/var/www/html/storage/*.key"
+    && chown -hR apache "/var/www/html/storage/" \
     && chown -R apache "/var/lib/snipeit"
 
 # Install composer

From ed98683496e5ce945f3ceba8ddea524ef8f42865 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 4 May 2021 22:40:04 -0700
Subject: [PATCH 10/12] Add @mikecmpbll as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 73d95cce64..2b182a2476 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2324,6 +2324,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "mikecmpbll",
+      "name": "Mike Campbell",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1962801?v=4",
+      "profile": "https://github.com/mikecmpbll",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index 60652e25d1..0b7f4c3dec 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-255-orange.svg?style=flat-square)](#contributors) 
+[![All Contributors](https://img.shields.io/badge/all_contributors-256-orange.svg?style=flat-square)](#contributors) 
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -125,7 +125,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http://david.davenne.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [<img src="https://avatars.githubusercontent.com/u/13993216?v=4" width="110px;"/><br /><sub>Joly0</sub>](https://github.com/Joly0)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>theburger</sub>](https://github.com/limeless)<br />[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

From 36a43642d8334712defe4e49942cea51e7914951 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 5 May 2021 01:50:02 -0500
Subject: [PATCH 11/12] Changed the orderBy clause inside the custom reports
 function that forms the CSV to be 'id' so making it a unique value and don't
 causes repeated items. [ch14587] (#9535)

---
 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 3b55e43a02..4b92634b4d 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -641,7 +641,7 @@ class ReportsController extends Controller
                 $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
             }
             
-            $assets->orderBy('assets.created_at', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) {
+            $assets->orderBy('assets.id', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) {
 
                 $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"];
                 \Log::debug('Walking results: '.$executionTime);

From 6935d941846b985b9758632498a1402bfed462d5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 5 May 2021 00:03:33 -0700
Subject: [PATCH 12/12] Bumped hash

Signed-off-by: snipe <snipe@snipe.net>
---
 config/version.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/version.php b/config/version.php
index bff7058c95..2b06619fef 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v5.1.5',
-  'full_app_version' => 'v5.1.5 - build 6029-gb8c356443',
-  'build_version' => '6029',
+  'full_app_version' => 'v5.1.5 - build 6055-gd9d5b4d73',
+  'build_version' => '6055',
   'prerelease_version' => '',
-  'hash_version' => 'gb8c356443',
-  'full_hash' => 'v5.1.5-125-gb8c356443',
+  'hash_version' => 'gd9d5b4d73',
+  'full_hash' => 'v5.1.5-17-gd9d5b4d73',
   'branch' => 'develop',
 );
\ No newline at end of file