nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-22 13:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/remote-upload-merge'

Browse Source 
# Conflicts:
#	public/mix-manifest.json
This commit is contained in:
Čarodej
2022-04-22 16:37:07 +02:00
parent c2595a0de4 d586eb9d7e
commit 4b366747b6
61 changed files with 966 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/filesystems.php
+9 -9
View File
@@ -47,19 +47,19 @@ return [
'endpoint' => env('S3_URL'),
],
'ftp' => [
'driver' => 'ftp',
'host' => env('FTP_HOST'),
'driver' => 'ftp',
'host' => env('FTP_HOST'),
'username' => env('FTP_USERNAME'),
'password' => env('FTP_PASSWORD'),
],
'azure' => [
'driver' => 'azure',
'name' => env('AZURE_STORAGE_NAME'),
'key' => env('AZURE_STORAGE_KEY'),
'container' => env('AZURE_STORAGE_CONTAINER'),
'url' => env('AZURE_STORAGE_URL'),
'prefix' => null,
'connection_string' => env('AZURE_STORAGE_CONNECTION_STRING') // optional, will override default endpoint builder
'driver' => 'azure',
'name' => env('AZURE_STORAGE_NAME'),
'key' => env('AZURE_STORAGE_KEY'),
'container' => env('AZURE_STORAGE_CONTAINER'),
'url' => env('AZURE_STORAGE_URL'),
'prefix' => null,
'connection_string' => env('AZURE_STORAGE_CONNECTION_STRING'), // optional, will override default endpoint builder
],
],
];
config/language-translations.php
+7
View File
@@ -942,5 +942,12 @@ return [
'paste_code_from_2fa_app' => 'Paste the latest code from 2fa app...',
'zero_for_unlimited_members' => 'Type -1 to set unlimited team members.',
'max_team_members' => 'Max Team Members',
'remote_upload' => 'Remote Upload',
'upload_files_remotely' => 'Upload Files Remotely',
'remote_links' => 'Remote Links',
'remote_links_help' => 'For every line paste one link',
'paste_remote_links_here' => 'Paste your remote links here...',
'remote_download_submitted' => 'Your links will be downloaded as soon as possible',
'remote_download_processed' => 'Your links were processed successfully',
],
];