Merge remote-tracking branch 'snipe-origin/develop' into develop

.gitignore

@@ -56,3 +56,4 @@ tests/_support/_generated/*
 \.php_cs\.dist
 
 phpmd\.xml
+/public/storage

app/Models/CustomFieldset.php

@@ -15,7 +15,7 @@ class CustomFieldset extends Model
      * Validation rules
      * @var array
      */
-    protected $rules = [
+    public $rules = [
         "name" => "required|unique:custom_fieldsets"
     ];
 

public/mix-manifest.json

@@ -5,7 +5,7 @@
     "/js/build/vue.js.map": "/js/build/vue.js.map?id=3aae6e8f609e5cd2842a",
     "/css/build/AdminLTE.css.map": "/css/build/AdminLTE.css.map?id=fa40c591a5b361cb0761",
     "/css/build/app.css.map": "/css/build/app.css.map?id=5a1bc8c3be0d3da37d0a",
-    "/css/all.css": "/css/all.css?id=d4da88a066c39e0ef7d0",
+    "/css/all.css": "/css/all.css?id=0a9b14700366dedbfab4",
     "/css/skins/skin-green-dark.min.css": "/css/skins/skin-green-dark.min.css?id=1039ae0e198a7f3d8da7",
     "/css/skins/skin-orange-dark.min.css": "/css/skins/skin-orange-dark.min.css?id=9a461970f7ab07f40847",
     "/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795",

resources/views/layouts/basic.blade.php

@@ -12,7 +12,7 @@
     <!-- Select2 -->
     <link rel="stylesheet" href="{{ url(asset('js/plugins/select2/select2.min.css')) }}">
 
-    <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
+    <link rel="stylesheet" href="{{ url(mix('css/all.css')) }}">
     <link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">
 
 

webpack.mix.js

@@ -12,8 +12,8 @@ mix
   .less("./resources/assets/less/app.less", "css/build")
   .styles(
     [
-      "./public/css/build/AdminLTE.css",
       "./node_modules/select2/dist/css/select2.css",
+      "./public/css/build/AdminLTE.css",
       "./node_modules/admin-lte/plugins/iCheck/minimal/blue.css",
       "./node_modules/font-awesome/css/font-awesome.css",
       "./node_modules/icheck/skins/minimal/minimal.css",