Merge tag 'v2.4.13' into develop

alexusmai · Mar 7, 2020 · 52897d9 · 52897d9
2 parents 7016f73 + c5425e0
commit 52897d9
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,8 @@
 
 **Vue.js Frontend:** [alexusmai/vue-laravel-file-manager](https://github.com/alexusmai/vue-laravel-file-manager)
 
+**--- Laravel 7 support added but not fully tested!! ---**
+
 ## Documentation
 
 [Laravel File Manager Docs](./docs/index.md)
@@ -64,7 +66,7 @@
 * Events (v2.2)
 * Thumbnails lazy load
 * Dynamic configuration (v2.4)
-* Supported locales : ru, en, ar, sr, cs, de, es, nl, zh-CN, fa, it, tr
+* Supported locales : ru, en, ar, sr, cs, de, es, nl, zh-CN, fa, it, tr, fr, pt_BR
 
 ## In a new version 2.4
 

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "php": ">=7.1.0",
         "ext-zip": "*",
         "ext-json": "*",
-        "laravel/framework": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
+        "laravel/framework": "^5.5|^6.0|^7.0",
         "league/flysystem": "^1.0",
         "intervention/image": "^2.4",
         "intervention/imagecache": "^2.3"

diff --git a/docs/events.md b/docs/events.md
@@ -1,5 +1,19 @@
 # Events
 
+### BeforeInitialization
+
+> Alexusmai\LaravelFileManager\Events\DBeforeInitialization
+
+Example:
+
+```php
+\Event::listen('Alexusmai\LaravelFileManager\Events\BeforeInitialization',
+    function ($event) {
+
+    }
+);
+```
+
 ### DiskSelected
 
 > Alexusmai\LaravelFileManager\Events\DiskSelected

diff --git a/resources/views/ckeditor.blade.php b/resources/views/ckeditor.blade.php
@@ -10,8 +10,8 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>

diff --git a/resources/views/fmButton.blade.php b/resources/views/fmButton.blade.php
@@ -10,8 +10,8 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>

diff --git a/resources/views/summernote.blade.php b/resources/views/summernote.blade.php
@@ -10,8 +10,8 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>

diff --git a/resources/views/tinymce.blade.php b/resources/views/tinymce.blade.php
@@ -10,8 +10,8 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>

diff --git a/resources/views/tinymce5.blade.php b/resources/views/tinymce5.blade.php
@@ -10,8 +10,8 @@
     <title>{{ config('app.name', 'File Manager') }}</title>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css">
     <link href="{{ asset('vendor/file-manager/css/file-manager.css') }}" rel="stylesheet">
 </head>
 <body>

diff --git a/src/Controllers/FileManagerController.php b/src/Controllers/FileManagerController.php
@@ -2,6 +2,7 @@
 
 namespace Alexusmai\LaravelFileManager\Controllers;
 
+use Alexusmai\LaravelFileManager\Events\BeforeInitialization;
 use Alexusmai\LaravelFileManager\Events\Deleting;
 use Alexusmai\LaravelFileManager\Events\DirectoryCreated;
 use Alexusmai\LaravelFileManager\Events\DirectoryCreating;
@@ -44,6 +45,8 @@ public function __construct(FileManager $fm)
      */
     public function initialize()
     {
+        event(new BeforeInitialization());
+
         return response()->json(
             $this->fm->initialize()
         );

diff --git a/src/Events/BeforeInitialization.php b/src/Events/BeforeInitialization.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Alexusmai\LaravelFileManager\Events;
+
+class BeforeInitialization
+{
+    /**
+     * BeforeInitialization constructor.
+     */
+    public function __construct()
+    {
+
+    }
+}