From dc32e4bdb02049a601a06e385615371eba73615e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 6 Nov 2017 16:42:37 -0800
Subject: [PATCH 1/4] Fixed form request ffor custom fields

---
 app/Http/Requests/CustomFieldRequest.php | 26 +++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/Http/Requests/CustomFieldRequest.php b/app/Http/Requests/CustomFieldRequest.php
index f1f09e40d..c6d661c4f 100644
--- a/app/Http/Requests/CustomFieldRequest.php
+++ b/app/Http/Requests/CustomFieldRequest.php
@@ -3,6 +3,7 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\Request;
 
 class CustomFieldRequest extends FormRequest
 {
@@ -21,11 +22,26 @@ class CustomFieldRequest extends FormRequest
      *
      * @return array
      */
-    public function rules()
+    public function rules(Request $request)
     {
-        return  [
-            "name" => "required|unique:custom_fields",
-            "custom_format" => "valid_regex",
-        ];
+        
+        $rules = [];
+
+        switch($this->method())
+        {
+
+            // Brand new
+            case 'POST':
+            {
+                $rules['name'] = "required|unique:custom_fields";
+                break;
+            }
+
+            default:break;
+        }
+
+        $rules['custom_format'] = 'valid_regex';
+
+        return  $rules;
     }
 }

From b96d4dcf1f4c18b5db3a5ec5638f0ba8fff551ee Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 6 Nov 2017 16:43:27 -0800
Subject: [PATCH 2/4] =?UTF-8?q?Don=E2=80=99t=20show=20ANY=20in=20custom=20?=
 =?UTF-8?q?regex=20field=20if=20empty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/custom_fields/fields/edit.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 918545de7..ff57ba275 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -82,7 +82,7 @@
               {{ trans('admin/custom_fields/general.field_custom_format') }}
             </label>
             <div class="col-md-6 required">
-                {{ Form::text('custom_format', Input::old('custom_format', $field->format), array('class' => 'form-control', 'id' => 'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }}
+                {{ Form::text('custom_format', Input::old('custom_format', (($field->format!='') && ($field->format!='ANY')) ? $field->format : ''), array('class' => 'form-control', 'id' => 'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }}
                 <p class="help-block">{!! trans('admin/custom_fields/general.field_custom_format_help') !!}</p>
 
               {!! $errors->first('custom_format', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}

From b772d8e52742fc45520f1982fb89dca9c7bf4712 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 6 Nov 2017 16:51:46 -0800
Subject: [PATCH 3/4] Fix for IIS+ Chrome not showing webfonts

Thanks, @BrettFagerlund!
---
 public/web.config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/web.config b/public/web.config
index 624c1760f..13847188a 100644
--- a/public/web.config
+++ b/public/web.config
@@ -19,5 +19,9 @@
         </rule>
       </rules>
     </rewrite>
+    <staticContent>
+        <remove fileExtension=".woff2" />
+        <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
+    </staticContent>
   </system.webServer>
 </configuration>

From 0589652edbcc99e0b68519ea565ccc01264206d6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 6 Nov 2017 17:17:48 -0800
Subject: [PATCH 4/4] Fixed #4392 - select2 + fastclick incompatibility

This is a workaround fix - should upgrade both to latest after testing extensively
---
 resources/views/layouts/default.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 1948a1d3f..0a4e347b7 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -771,6 +771,7 @@
     <script nonce="{{ csrf_token() }}">
         $(function () {
             $('[data-toggle="tooltip"]').tooltip();
+            $('.select2 span').addClass('needsclick');
 
             // This javascript handles saving the state of the menu (expanded or not)
             $('body').bind('expanded.pushMenu', function() {
@@ -798,6 +799,8 @@
             $(this).ekkoLightbox();
         });
 
+
+
     </script>
 
     @if ((Session::get('topsearch')=='true') || (Request::is('/')))