nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-20 17:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into api

Browse Source 
# Conflicts:
#	.env.testing
#	public/mix-manifest.json
#	src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
This commit is contained in:
Čarodej
2022-05-11 09:00:42 +02:00
parent 4250e58370 000b5459f9
commit d2371e667f
83 changed files with 803 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Domain/SetupWizard/Controllers/StoreDatabaseCredentialsController.php
View File

@@ -27,7 +27,7 @@ class StoreDatabaseCredentialsController extends Controller
'port' => $request->input('port'),
'database' => $request->input('name'),
'username' => $request->input('username'),
'password' => $request->input('password'),
'password' => $request->input('password') ?? '',
],
]);
@@ -51,7 +51,7 @@ class StoreDatabaseCredentialsController extends Controller
'DB_PORT' => $request->input('port'),
'DB_DATABASE' => $request->input('name'),
'DB_USERNAME' => $request->input('username'),
'DB_PASSWORD' => $request->input('password'),
'DB_PASSWORD' => $request->input('password') ?? '',
]);
Artisan::call('config:cache');

2
src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
View File

@@ -92,7 +92,7 @@ class StoreEnvironmentSettingsController extends Controller
'PUSHER_APP_CLUSTER' => $request->input('broadcast.cluster'),
'PUSHER_APP_HOST' => '',
'PUSHER_APP_PORT' => '',
'PUSHER_APP_TLS' => true,
'PUSHER_APP_TLS' => 'true',
],
'native' => [
'BROADCAST_DRIVER' => 'pusher',

2
src/Domain/SetupWizard/Requests/StoreDatabaseCredentialsRequest.php
View File

@@ -28,7 +28,7 @@ class StoreDatabaseCredentialsRequest extends FormRequest
'port' => 'required|string',
'name' => 'required|string',
'username' => 'required|string',
'password' => 'required|string',
'password' => 'nullable|sometimes|string',
];
}
}