From 37f2c7beac2a18e26efc4126adbfc5e2933c851a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 18 Aug 2021 00:44:16 -0700
Subject: [PATCH 1/4] Nicer bulk asset select width

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/forms/edit/asset-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/asset-select.blade.php b/resources/views/partials/forms/edit/asset-select.blade.php
index 91b53b6ce6..2869dcda31 100644
--- a/resources/views/partials/forms/edit/asset-select.blade.php
+++ b/resources/views/partials/forms/edit/asset-select.blade.php
@@ -1,7 +1,7 @@
 <!-- Asset -->
 <div id="assigned_asset" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
+    <div class="col-md-8{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
         <select class="js-data-ajax select2" data-endpoint="hardware" data-placeholder="{{ trans('general.select_asset') }}" aria-label="{{ $fieldname }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}>
 
             @if ((!isset($unselect)) && ($asset_id = old($fieldname, (isset($asset) ? $asset->id  : (isset($item) ? $item->{$fieldname} : '')))))

From 8a6c7269d31c5e23c0e3d73043d8e4753d4f9781 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 18 Aug 2021 00:44:55 -0700
Subject: [PATCH 2/4] Fixed border radius for bulk checkout field [ch16936]

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/assets/less/overrides.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 73ab8ad1b4..6e5b5ef980 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -563,4 +563,8 @@ th.css-accessory > .th-inner::before
 
 .form-group.has-error label {
   color: #a94442;
+}
+
+.select2-container--default .select2-selection--multiple {
+  border-radius: 0px;
 }
\ No newline at end of file

From f8562e5835f6dbdd493a05d6371ef46e3713b585 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 18 Aug 2021 00:45:02 -0700
Subject: [PATCH 3/4] Recompiled assets

Signed-off-by: snipe <snipe@snipe.net>
---
 package-lock.json              |  10 +++-------
 public/css/build/app.css       | Bin 16859 -> 16942 bytes
 public/css/build/overrides.css | Bin 10009 -> 10092 bytes
 public/css/dist/all.css        | Bin 436888 -> 437054 bytes
 public/js/build/app.js         | Bin 1711739 -> 1711645 bytes
 public/js/dist/all.js          | Bin 3118165 -> 3118071 bytes
 public/mix-manifest.json       |  10 +++++-----
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe9d234a9d..b0bfa7df2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11629,8 +11629,7 @@
         "picomatch": {
           "version": "2.2.2",
           "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-          "optional": true
+          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
         },
         "pify": {
           "version": "2.3.0",
@@ -14236,7 +14235,6 @@
               "version": "4.0.1",
               "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
               "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-              "optional": true,
               "requires": {
                 "is-extglob": "^2.1.1"
               }
@@ -14250,8 +14248,7 @@
             "normalize-path": {
               "version": "3.0.0",
               "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-              "optional": true
+              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
             },
             "readdirp": {
               "version": "3.4.0",
@@ -18326,8 +18323,7 @@
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
       "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "pify": {
       "version": "2.3.0",
diff --git a/public/css/build/app.css b/public/css/build/app.css
index 239aa98dfec13ea962f22f69050c7726b9df2a3f..cd813a7e7b6892d47d9b8c00bbddf366312ad95e 100644
GIT binary patch
delta 34
qcmccJ%($+Fal>uL$uAuYIC4vKN-_&_QYSYuiLe_KR9JJ>asdDV3=Gr&

delta 9
QcmZ42!g#xxal>s#02T@aUjP6A

diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index 94adeae5d2c3bdcde9a82e001620aa622dc02a98..5671fb0427dd5d43e6822e72817fe17d9fe162d5 100644
GIT binary patch
delta 47
zcmbQ~_r`C7r21raH3Q|`(wvgaf}B)^YAywZr2L|k)FR!Y#FWg^Vk-rMf(mP{S}p*X
Cdk_Zz

delta 7
OcmaFkH`8x}q&ff&?E?}3

diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 6f6b3c7b4662c591598a7bd2b8ceab5b634d0da3..1a03309e757529fd8f000e3b939e4bb7244c8c99 100644
GIT binary patch
delta 85
zcmbPnRchZgsfHHD7N!>F7M2#)Eo|%Ur?;fBs7{afXXBn85X&YqIo_9JI=?s@`*h|+
UHsR?CtZb~?kK40d%)+G(0Js1dxBvhE

delta 37
tcmdmYO=`wfsfHHD7N!>F7M2#)Eo|%Ur%$e96P~WX%Er1~%7N`-761)t4BG$z

diff --git a/public/js/build/app.js b/public/js/build/app.js
index f252eb441b3488ef3198ab8fca6d67512331a76c..0bfd61eb24b304f01633f1e0e8eb7cbff4984b62 100644
GIT binary patch
delta 979
zcmaKqOD_Xa7=}}qnob9un(6d>btyt4)zDZFq*l_Mh--upsV2q(Q5y@=!~#1~$wxx`
z02_&gjUQkmegYc{i6Cqwu5XK-p2d^AGw*XwzH?^Y&SwwLXHVL@ltdz#N-ZqenRLvT
z>4?>2Zo2)a;jTtaoBpj<LY*qt?mK*$hj^>{_ts9XN8=mOxC0b`LQn*XffJMf1-O6;
z+&}}RpbV4)572=ZQ~(2*zy~bgKa0l2=7o`(w-=KwgZ6SV)so8*dzsTF1$gpSxOtbz
z%qABHJyb8TV>+okwI+&r+e5u_(cq9yeg8XqI_>=5V5lJX-wTDECROsbm%<Y9(@W!d
z>oBKZa5%-JhHP^2O@-ueunkgp%%B0ujuDeevy+YHb++<0tvunQMBX~gJx@Yq%c3EP
z^Jq~yzXhm?FCRo1e_2!~u^0R_BdNdMaX-z1h9%CGpgBo>R6y?Rg@hPM;}WlQ9ym^p
zIPeqU2)QM>M>nqqr0ekcin#h&X#5eN5y?2mufp@QH<HeGmDDD&532r#N4ow7$8<~E

delta 1200
zcmb8tJxfAi6bEp6vCMnBUQO*jM~g@*M9`uj;x-gCI0Ql2*kEZYy%=gk)YcG9(h#SH
zpbyX>G&m$}K|?`nOVH9>&=3UGU-|;a;Rk0p|K~jS+~=a6`>yAzllJwQP5NOhaTH6m
zKr6ICJ2;>NI>8BD-~tVF=mrDaV1fs{&;vg3LjZcgs>Kp2cOT9c((A>{UVN^ww!4+t
zE|=m<`EsTd&lU?Csnz^uzP!h&9tyJkrZj#sX;vPY@laCUUA<EQe)iD3C^F@x6Hy~B
zKfpg;T99_{iyBW9MS0~DJ5hZ!)Tp{R>7%eXe0oJrzV*?fIKc~kO3S+|0dnx=m+Isn
ze=}2%%QZ3OL+N~MVFi^B<!WvPjfjH{i(GsYqzG#kjmjs_{HpFoZiG=8T(@XY8Xn_*
zjXF4@gzpnS`&4>%ln>fS;~k=9dBhHq`Ts4b#^t#ejokdGXqZtM{2mlOz}FCsaV3Ps
VKPW8F)G_`%L=%$9HH4>I{s1JOuzmml

diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index 5e7cc9ec381c3dbed78626ff33037a81f5c28b3b..aa2e5f7853a5cf76cac95223ce6c8c1343341c53 100644
GIT binary patch
delta 1066
zcmaLVKS&!<90zdDYP?)d&BeQ1-tQ8Pf1{o;h7Oim(n+$3v}!3WEs|!q4k|{34wZm|
zx+xKU76eCyE`<)##kouA)ZN8F5EUIP^pAcMbu(}H!0+z&eUIOJcfWS`mCK!d<;&2p
zn#<)2g_$|8RLq1+k20;LgC~)%?r^uRPu;dYBpz$r_DKnsPO^jA-CHlel+G@vvkKI}
z1E_^M@IgJO;0Fx?phE*RLK6hRfDkl;2^NIGhR9wzD^|Xng=ud#pL*`i=L@Myo%H6p
zXpzHj4n=@Bh^%tu=Xj7hB<YMn8oyl>b-Wg&5qZ$$gh8YCXEqI5zrTZ_;yiXNRQ6dE
z<+TvGlHmUky{g)Fxp;xYsTOsWD?cAJOAd#$Nh-fI>6v85q(u$o$zD{=tXAy|^6N0=
zs<vHzdL}fsZ5o$kPHk%9KMwWsj}y_zS2ndv(lZfyCuv{(#r^aPnvi6E3VJVTZ`V+u
zd?5)&rE`5qIu9~FPAd3`aD>W|%42{(I?{Fce6`$iE_D9q(4=IX&%Z_RW^YsmA4Tb*
vB)t{89ex=VI1q&xv_LDwp$*!h13IA#x*-8Q&<lOwLO&#7U~emy`nGTl%)4q$

delta 1286
zcmb8ty)Q#y6bA4VMSH8-YU{q|UX*I9N=ryYx{w$;NF+W+gO8%|QK2HjW)M?jki%wU
zFh~pr(oJF@u^228i<v~igs1TjoDRR_4Ci^zd(VBpP79W&vx4QKFL`;CB*$(%wHHrW
zpbW~P0<2I8RZtB!u!9B;r~xO`f(zW>fjaPl5ByLM`c*uo7Vd)c+1a_Z^j2ahJF~Hz
zUdgQ|#xl9|dSZSpyErwSS<2+Lc&d&JPQEFPA6+ykj|{kJT;6?gtNi@zreRT}-$MtY
zMqEC?KOP#9c5jOs4;00C@)J8z4HPO?HXip<P#iuyr)n;EX;hrx5g*OUyYqgs^2xWV
z;vZirQ;=IIVakVc@V<@}<Uf?Xv=tO1R(9%S=WBzatm)JxpFHrZYKplCqjK_%PA$@K
zH#cfj$x$VIpZM8_(z9c{Q%)MM5>3b>NrPPf--4<~o_o=#mLC*_8I_aY4dDZPHL08P
zCKi9Mut1js<Bv`1l}z447z{9>0UDtR0?-UC5QJ6;K^P*?22p5-7<51<#IIh>gn#o7
Dt02^5

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 185b2e3da5..05afa77cc4 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=2dda57788e5f3e10a495",
+    "/js/build/app.js": "/js/build/app.js?id=bc7b4abd14bd251cf575",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=d4b206b68326a81a37aa",
-    "/css/build/app.css": "/css/build/app.css?id=2da4f8fd0e80c4232b92",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=0bb9f67c5f027502f7da",
+    "/css/build/app.css": "/css/build/app.css?id=5deb68b557ab110321fe",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=322bc74ed60c4cc8c2eb",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=dea194b1336f156866c2",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=b9d1005a03a7e60c138e",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=ac15efa2e742bc1e8a6b",
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=35a91c8d799c2e5b6e83",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f6c05a68079b3836a32f",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=279fd3bd5a093698c223",
-    "/css/dist/all.css": "/css/dist/all.css?id=53f8c26d43ca1bea78b0",
+    "/css/dist/all.css": "/css/dist/all.css?id=319274d32c2ace624e38",
     "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
     "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
@@ -26,7 +26,7 @@
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=d729a1e2e97f290cc4e2",
     "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=a17945119a381c758e1f",
-    "/js/dist/all.js": "/js/dist/all.js?id=d0ab01f5868648649e6f",
+    "/js/dist/all.js": "/js/dist/all.js?id=c3d790d05b16a6e3a0bd",
     "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=e4c4239c8468412ab44d",
     "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=100ec9e757b3d8a3325e",
     "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=ee7618c270b8a9b0f306",

From 0aa328f908bfb46e07f15d0a29a3f714fce9a30f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 18 Aug 2021 00:45:35 -0700
Subject: [PATCH 4/4] Updated 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 2373f45142..5c08bce7ca 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v5.1.8',
-  'full_app_version' => 'v5.1.8 - build 6148-g3ca3de9e4',
-  'build_version' => '6148',
+  'full_app_version' => 'v5.1.8 - build 6257-gb5bb74b8c',
+  'build_version' => '6257',
   'prerelease_version' => '',
-  'hash_version' => 'g3ca3de9e4',
-  'full_hash' => '5.1.8-8-g3ca3de9e4',
+  'hash_version' => 'gb5bb74b8c',
+  'full_hash' => 'v5.1.8-106-gb5bb74b8c',
   'branch' => 'develop',
 );
\ No newline at end of file