Merge branch 'develop' into JS_Cleanup

.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"
     ];
 

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