Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json

app/Http/Requests/FileFunctions/UploadRequest.php

@@ -24,6 +24,7 @@ class UploadRequest extends FormRequest
     public function rules()
     {
         return [
+            'filename' => 'required|string',
             'folder_id' => 'nullable|uuid',
             'file'      => ['required', 'file', new DisabledMimetypes],
         ];