Skip to content

Commit 65cc4b1

Browse files
authored
Merge branch 'master' into patch-1
2 parents 7b17546 + 78aeffe commit 65cc4b1

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</p>
3333

3434
## Installing alpha version
35-
The alpha version of `v2.0` contains support of cloud storage and fresh new UI with RWD.
35+
The alpha version of `v2.0` contains support for cloud storage and fresh new UI with RWD.
3636

3737
* Run `composer require unisharp/laravel-filemanager:dev-master` to get the latest code.
3838
* Run `composer require unisharp/laravel-filemanager:v2.0.0-alpha8` to get the latest release of alpha version.

src/LfmStorageRepository.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ public function makeDirectory()
5757
{
5858
$this->disk->makeDirectory($this->path, ...func_get_args());
5959

60-
$this->disk->setVisibility($this->path, 'public');
60+
// some filesystems (e.g. Google Storage, S3?) don't let you set ACLs on directories (because they don't exist)
61+
// https://cloud.google.com/storage/docs/naming#object-considerations
62+
if ($this->disk->has($this->path)) {
63+
$this->disk->setVisibility($this->path, 'public');
64+
}
6165
}
6266

6367
public function extension()

src/views/index.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@
267267
paramName: "upload[]", // The name that will be used to transfer the file
268268
uploadMultiple: false,
269269
parallelUploads: 5,
270+
timeout:0,
270271
clickable: '#upload-button',
271272
dictDefaultMessage: lang['message-drop'],
272273
init: function() {

0 commit comments

Comments
 (0)