Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v5.1.8',
-  'full_app_version' => 'v5.1.8 - build 6227-g6b7d5ed5a',
-  'build_version' => '6227',
+  'full_app_version' => 'v5.1.8 - build 6257-gb5bb74b8c',
+  'build_version' => '6257',
   'prerelease_version' => '',
-  'hash_version' => 'g6b7d5ed5a',
-  'full_hash' => 'v5.1.8-76-g6b7d5ed5a',
+  'hash_version' => 'gb5bb74b8c',
+  'full_hash' => 'v5.1.8-106-gb5bb74b8c',
   'branch' => 'master',
 );

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",

public/mix-manifest.json

@@ -1,45 +1,21 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=c1186114e11927ef9270",
-    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=89f2b7816c4e00784b59",
-    "/css/build/app.css": "/css/build/app.css?id=f534465acd801cafe2a2",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=c544472168a356889508",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=2da78d31ca46509e2927",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=0845c3960331dcd5db3c",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=83a9d7106a863eb4536d",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=1f137fd2dcbac676d291",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=af88a4cc8e58dc298963",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=5ef650950378aeb72dfa",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=e6e05a21d5ac663afd52",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=19e3aa65576d724169cf",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=bbbca0f0b0b6c6a5e6a5",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=8b4b527b896e69a6680d",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=99b98cccd8992e8d9ee2",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=471a89378a1cff021e79",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0409748eb4bb77fe171a",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=7abb3dcd41ad0d4700b7",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=96477616f4a4b4ff1db8",
-    "/css/dist/all.css": "/css/dist/all.css?id=cc906fab5ad666abe433",
-    "/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",
-    "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
-    "/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=952b67441ed6f2db53cf",
-    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=1f137fd2dcbac676d291",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=af88a4cc8e58dc298963",
-    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=5ef650950378aeb72dfa",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=e6e05a21d5ac663afd52",
-    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=2da78d31ca46509e2927",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=0409748eb4bb77fe171a",
-    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=99b98cccd8992e8d9ee2",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=471a89378a1cff021e79",
-    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=0845c3960331dcd5db3c",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=19e3aa65576d724169cf",
-    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=bbbca0f0b0b6c6a5e6a5",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=8b4b527b896e69a6680d",
-    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=96477616f4a4b4ff1db8",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=7abb3dcd41ad0d4700b7",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=83a9d7106a863eb4536d"
+    "/js/build/app.js": "/js/build/app.js",
+    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css",
+    "/css/build/app.css": "/css/build/app.css",
+    "/css/build/overrides.css": "/css/build/overrides.css",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css"
 }

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;
 }

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} : '')))))