mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-05-19 11:45:01 +00:00
Merge remote-tracking branch 'origin/master' into light
# Conflicts: # .env.testing # README.md # composer.json # composer.lock # config/language-translations.php # config/vuefilemanager.php # public/chunks/admin.js # public/chunks/database.js # public/chunks/demo.js # public/chunks/files.js # public/chunks/my-shared-items.js # public/chunks/platform.js # public/chunks/recent-uploads.js # public/chunks/settings-storage.js # public/chunks/settings.js # public/chunks/shared.js # public/chunks/shared/browser.js # public/chunks/shared/single-file.js # public/chunks/sign-in.js # public/chunks/status-check.js # public/chunks/trash.js # public/chunks/user-storage.js # public/css/tailwind.css # public/js/main.js # public/mix-manifest.json # resources/js/components/Subscription/UserFixedSubscriptionDetail.vue # resources/js/store/modules/userAuth.js # resources/js/views/Admin.vue # resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue # resources/js/views/Admin/Plans.vue # resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue # resources/js/views/Admin/Settings/AppSettingsTabs/SignInUp.vue # resources/js/views/Demo.vue # resources/js/views/Frontpage/Homepage.vue # resources/js/views/Platform.vue # resources/views/index.blade.php # src/App/Console/Commands/SetupWebsocketEnvironment.php # src/App/Users/Models/UserLimitation.php # src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php # src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php # src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php # src/Domain/RemoteUpload/Requests/RemoteUploadRequest.php # src/Domain/Settings/Controllers/StoreBroadcastServiceCredentialsController.php # src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php # src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php # src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php # src/Support/Upgrading/Controllers/UpgradingVersionsController.php
This commit is contained in:
@@ -39,12 +39,13 @@ return [
|
||||
'visibility' => 'public',
|
||||
],
|
||||
's3' => [
|
||||
'driver' => 's3',
|
||||
'key' => env('S3_ACCESS_KEY_ID'),
|
||||
'secret' => env('S3_SECRET_ACCESS_KEY'),
|
||||
'region' => env('S3_DEFAULT_REGION'),
|
||||
'bucket' => env('S3_BUCKET'),
|
||||
'endpoint' => env('S3_URL'),
|
||||
'driver' => 's3',
|
||||
'key' => env('S3_ACCESS_KEY_ID'),
|
||||
'secret' => env('S3_SECRET_ACCESS_KEY'),
|
||||
'region' => env('S3_DEFAULT_REGION'),
|
||||
'bucket' => env('S3_BUCKET'),
|
||||
'endpoint' => env('S3_URL'),
|
||||
'visibility' => 'private',
|
||||
],
|
||||
'ftp' => [
|
||||
'driver' => 'ftp',
|
||||
|
||||
@@ -462,7 +462,7 @@ return [
|
||||
'server' => 'Server',
|
||||
'environment' => 'Environment',
|
||||
'storage_upload' => 'Storage & Upload',
|
||||
'allow_recaptcha' => 'Allow ReCaptcha',
|
||||
'allow_recaptcha' => 'Allow ReCaptcha v3',
|
||||
'allow_recaptcha_note' => 'ReCaptcha will be allowed on Registration and Contact Us forms.',
|
||||
'account' => 'Account',
|
||||
'search' => 'Search',
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ return [
|
||||
'facebook' => [
|
||||
'client_id' => env('FACEBOOK_CLIENT_ID'),
|
||||
'client_secret' => env('FACEBOOK_CLIENT_SECRET'),
|
||||
'redirect' => env('APP_URL') . '/socialite/facebook/callback',
|
||||
'redirect' => env('APP_URL') . '/socialite/facebook/callback/',
|
||||
],
|
||||
|
||||
'recaptcha' => [
|
||||
|
||||
Reference in New Issue
Block a user