Merge branch 'next' of https://github.com/Laravel-Backpack/demo into next

# Conflicts:
#	composer.lock

Author: tabacitu

.gitignore

@@ -15,3 +15,4 @@ Homestead.json
 /.vscode
 /packages
 /_volumes
+/public/basset

app/Http/Controllers/Admin/MonsterCrudController.php

@@ -15,7 +15,7 @@ class MonsterCrudController extends CrudController
     use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
     use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
     use \Backpack\CRUD\app\Http\Controllers\Operations\FetchOperation;
-    use \Backpack\Pro\Http\Controllers\Operations\DropzoneOperation { dropzoneUpload as traitDropzone; }
+    use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }
     use \App\Http\Controllers\Admin\Operations\SMSOperation; //Custom Form Operation Example
     use \Backpack\ActivityLog\Http\Controllers\Operations\ModelActivityOperation;
     use \Backpack\ActivityLog\Http\Controllers\Operations\EntryActivityOperation;
@@ -1703,10 +1703,11 @@ public static function getFieldsArrayForWysiwygEditorsTab()
                 'tab'   => 'WYSIWYG Editors',
             ],
             [   // Summernote
-                'name'  => 'summernote',
-                'label' => 'Summernote editor'.backpack_free_badge(),
-                'type'  => 'summernote',
-                'tab'   => 'WYSIWYG Editors',
+                'name'      => 'summernote',
+                'label'     => 'Summernote editor'.backpack_free_badge(),
+                'type'      => 'summernote',
+                'tab'       => 'WYSIWYG Editors',
+                'withFiles' => true,
             ],
             [   // CKEditor
                 'name'  => 'ckeditor',
@@ -1837,15 +1838,17 @@ public static function getFieldsArrayForMiscellaneousTab()
         ];
     }
 
-    public function dropzoneUpload()
+    public function ajaxUpload()
     {
         if (app('env') === 'production') {
             return response()->json(['errors' => [
-                'dropzone' => ['Uploads are disabled in production'],
+                'dropzone'   => ['Uploads are disabled in production'],
+                'easymde'    => ['Uploads are disabled in production'],
+                'summernote' => ['Uploads are disabled in production'],
             ],
             ], 500);
         }
 
-        return $this->traitDropzone();
+        return $this->traitAjaxUpload();
     }
 }

composer.json

@@ -16,7 +16,7 @@
         "backpack/backupmanager": "^5.0",
         "backpack/calendar-operation": "^1.0",
         "backpack/editable-columns": "^3.0",
-        "backpack/filemanager": "^3.0",
+        "backpack/filemanager": "dev-next as 3.99.99",
         "backpack/language-switcher": "^2.0",
         "backpack/logmanager": "^5.0",
         "backpack/menucrud": "^4.0",