Merge branch 'master' into better-slug

Author: streamtw

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,22 @@
-Please check the following instructions before submitting a bug :
- * Make sure you are using the latest version.
- * Make sure you read [installation](http://unisharp.github.io/laravel-filemanager/installation), [integration](http://unisharp.github.io/laravel-filemanager/integration), and [upgrade](http://unisharp.github.io/laravel-filemanager/upgrade) document.
-
-And provide the followings :
- * Operating system :
- * Laravel version :
- * Package version :
- * Steps to reproduce your issue :
- * Screenshots of browser console :
+## Delete this section after you read them:
+* Make sure you are using the latest version.
+* Make sure you read [installation](http://unisharp.github.io/laravel-filemanager/installation), [integration](http://unisharp.github.io/laravel-filemanager/integration), and [upgrade](http://unisharp.github.io/laravel-filemanager/upgrade) document.
+
+## Expected Behavior
+
+
+## Actual Behavior
+
+
+## Steps to Reproduce the Problem
+
+  1.
+  1.
+  1.
+
+## Specifications
+
+  * Operating system :
+  * Laravel version :
+  * Package version :
+  * Screenshots of browser console :

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,13 +4,25 @@ about: Create a report to help us improve
 
 ---
 
-Please check the following instructions before submitting a bug :
- * Make sure you are using the latest version.
- * Make sure you read [installation](http://unisharp.github.io/laravel-filemanager/installation), [integration](http://unisharp.github.io/laravel-filemanager/integration), and [upgrade](http://unisharp.github.io/laravel-filemanager/upgrade) document.
-
-And provide the followings :
- * Operating system :
- * Laravel version :
- * Package version :
- * Steps to reproduce your issue :
- * Screenshots of browser console :
+## Delete this section after you read them:
+* Make sure you are using the latest version.
+* Make sure you read [installation](http://unisharp.github.io/laravel-filemanager/installation), [integration](http://unisharp.github.io/laravel-filemanager/integration), and [upgrade](http://unisharp.github.io/laravel-filemanager/upgrade) document.
+
+## Expected Behavior
+
+
+## Actual Behavior
+
+
+## Steps to Reproduce the Problem
+
+  1.
+  1.
+  1.
+
+## Specifications
+
+  * Operating system :
+  * Laravel version :
+  * Package version :
+  * Screenshots of browser console :

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,14 +4,14 @@ about: Suggest an idea for this project
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+## Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Describe the solution you'd like
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+## Describe alternatives you've considered
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+## Additional context
 Add any other context or screenshots about the feature request here.

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 /docs/Gemfile.lock
 /docs/_site
 .DS_Store
+/.idea

.travis.yml

@@ -1,14 +1,14 @@
 language: php
 
 php:
-  - 7.2
-  - 7.1
-  - 7.0
+  - 8.0
+  - 7.4
   - 5.6
 
 matrix:
   fast_finish: true
   allow_failures:
+    - php: 7.4
     - php: 5.6
 
 before_script:

README.md

@@ -1,17 +1,20 @@
 <p align="center"><img src="https://unisharp.github.io/laravel-filemanager/images/logo_vertical_colored.png"></p>
 
 <p align="center">
+  <a href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/packagist/v/unisharp/laravel-filemanager" alt="Latest Stable Version"></a>
   <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://poser.pugx.org/unisharp/laravel-filemanager/downloads"></a>
   <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/packagist/dm/unisharp/laravel-filemanager.svg"></a>
-  <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/badge/stable-2.0.0-blue.svg"></a>
+  <!-- <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/badge/stable-2.6.4-blue.svg"></a> -->
   <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://poser.pugx.org/unisharp/laravel-filemanager/license"></a>
   <br>
-  <a target="_blank" href="https://travis-ci.org/UniSharp/laravel-filemanager"><img src="https://img.shields.io/travis/UniSharp/laravel-filemanager.svg"></a>
+  <a href="https://github.styleci.io/repos/39873788?branch=master"><img src="https://github.styleci.io/repos/39873788/shield?branch=master" alt="StyleCI"></a>
+  <a target="_blank" href="https://scrutinizer-ci.com/g/UniSharp/laravel-filemanager/?branch=master"><img src="https://scrutinizer-ci.com/g/UniSharp/laravel-filemanager/badges/build.png?b=master"></a>
   <a target="_blank" href="https://scrutinizer-ci.com/g/UniSharp/laravel-filemanager/"><img src="https://scrutinizer-ci.com/g/UniSharp/laravel-filemanager/badges/quality-score.png?b=master"></a>
   <a target="_blank" href="https://codeclimate.com/github/UniSharp/laravel-filemanager/maintainability"><img src="https://api.codeclimate.com/v1/badges/e51f2ef8f4d9f97268db/maintainability" /></a>
-  <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/badge/unstable-dev--master-orange.svg"></a>
 </p>
 
+![RWD demo](https://unisharp.github.io/laravel-filemanager/images/screenshots-v2.png)
+
 <p align="center">
   <a href="http://unisharp.github.io/laravel-filemanager/">Documents</a>
 ・
@@ -32,43 +35,42 @@
   <a href="https://github.com/UniSharp/laravel-filemanager/wiki">FAQ</a>
 </p>
 
-## v2.0 progress
-🎉 Finally v2.0.0 has been released! 🎉
-
-These are primary features of this update:
-* Redesigned RWD user interface.
-* Supporting multiple files selection.
-* Supporting cloud storages integration(with Laravel file system).
-* Refactored code and increased test coverage.
-
-Although it is not perfect enough, we decided to release it. Now users who want the above features won't need to install alpha versions anymore.
+## Features
+ * File upload and management
+ * Uploading validation
+ * Cropping and resizing of images
+ * RWD user interface, and can be entirely customized
+ * Supporting multiple files selection
+ * Supporting cloud storages integration(with Laravel file system)
+ * Multiple integration options:
+    * WYSIWYG editors integration (CKEditor, TinyMCE, Summernote)
+    * Standalone upload button
+    * Iframe
+ * Multi-user mode:
+    * Shared folders: all users can upload and manage files
+    * Private folders: dedicated folder for each user, only the owner can upload or manage files within
+ * Customizable routes, middlewares, views, and folder path
+ * Supports two categories: files and images. Each type works in different directory.
+ * Supported locales : ar, az, bg, cs, de, el, en, es, eu, fa, fr, he, hu, id, it, ka, nl, pl, pt, pt-BR, ro, rs, ru, sk, sv, tr, uk, vi, zh-CN, zh-TW
 
-There are still some thing we need to do make this package better:
-* [ ] Documents for v2.0.0
-* [ ] Events should pass object instead of only file path
-* [ ] Add more events for files and folders manipulation
-
-We are also going to gain more integration like vue.js and Laravel Nova. Any PR is welcome!
-
-![RWD demo](https://unisharp.github.io/laravel-filemanager/images/screenshots-v2.png)
+## Maintainers
 
-## Contributors & Credits
+ * [Stream](https://github.com/streamtw)
+ * [Youchen Lee](https://github.com/youchenlee)
+ * [Willem Leuverink](https://github.com/gwleuverink)
 
-### Developers / Maintainers
+## Contributors
 
- * [Stream](https://github.com/g0110280)
- * [@gwleuverink](https://github.com/gwleuverink)
  * All [@UniSharp](https://github.com/UniSharp) members
-
-### Contributors
-
- * [All contibutors](https://github.com/UniSharp/laravel-filemanager/graphs/contributors) from GitHub. (issues / PR)
- * [@taswler](https://github.com/tsawler) the original author of this package.
- * Nathan for providing security suggestions.
+ * Security contributors (sort by alphabet)
+    * Ayon Hasan (@lollipopl337)
+    * Nathan
  * [@mdnazmulhasan27771](https://github.com/mdnazmulhasan27771) the designer of our logo. (Licensed CC BY 4.0)
+ * [All contibutors](https://github.com/UniSharp/laravel-filemanager/graphs/contributors) from GitHub. (issues / PR)
 
-### Credits
+## Credits
 
+ * [@taswler](https://github.com/tsawler) the original author of this package.
  * [@olivervogel](https://github.com/olivervogel) for the awesome [image library](https://github.com/Intervention/image).
  * SVG Loaders by [Sam](http://samherbert.net/svg-loaders/) (Licensed MIT)
  * Articles and videos which helped promoting this package.

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "unisharp/laravel-filemanager",
-  "description": "A file upload/editor intended for use with Laravel 5 to 6 and CKEditor / TinyMCE",
+  "description": "A file upload/editor intended for use with Laravel 5 to 10 and CKEditor / TinyMCE",
   "license": "MIT",
   "keywords": [
     "filemanager",
@@ -23,19 +23,20 @@
     }
   ],
   "require": {
-    "php": ">=7.2.0",
+    "php": ">=8.1",
     "ext-exif": "*",
     "ext-fileinfo": "*",
-    "intervention/image": "2.*",
-    "illuminate/config": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0",
-    "illuminate/filesystem": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0",
-    "illuminate/support": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0",
-    "illuminate/http": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0",
-    "illuminate/container": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0"
+    "intervention/image": ">=3.11.3",
+    "illuminate/config": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+    "illuminate/filesystem": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+    "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+    "illuminate/http": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+    "illuminate/container": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+    "league/flysystem": ">=2.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.2",
-    "mockery/mockery": "^0.9.9",
+    "phpunit/phpunit": "~8.0",
+    "mockery/mockery": "~1.3.0",
     "squizlabs/php_codesniffer": "^3.1"
   },
   "suggest": {

docs/_config.yml

@@ -3,7 +3,7 @@ theme: jekyll-theme-cayman
 # Setup
 title: Laravel File Manager
 description: It's like Dropbox for your Laravel app.
-google_analytics: UA-92410814-4
+google_analytics: G-X9XY279785
 
 # About/contact
 author:

docs/_layouts/default.html

@@ -1,6 +1,16 @@
 <!DOCTYPE html>
 <html lang="en-us">
   <head>
+    {% if site.google_analytics %}
+      <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
+      <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', '{{ site.google_analytics }}');
+      </script>
+    {% endif %}
     <meta charset="UTF-8">
     <title>{{ page.title | default: site.title }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -125,17 +135,5 @@ <h2 class="project-tagline">{{ site.description | default: site.github.project_t
         <span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</span>
       </footer>
     </section>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-        ga('create', '{{ site.google_analytics }}', 'auto');
-        ga('send', 'pageview');
-      </script>
-    {% endif %}
   </body>
 </html>