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

fixes

Browse Source
This commit is contained in:
Čarodej
2022-04-27 16:30:48 +02:00
parent 08ee6567bc
commit 68d1e2e60b
8 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/language-translations.php
View File

@@ -1,7 +1,7 @@
<?php
return [
'regular' => [
'regular' => [
'type' => 'Type',
'cancel' => 'Cancel',
'close' => 'Close',
@@ -61,7 +61,7 @@ return [
'admin_settings.email.port' => 'Mail Port',
'admin_settings.email.save_button' => 'Save Email Settings',
'clear_cache' => 'Clear Cache',
'admin_settings.others.default_storage' => 'Default Storage Space for User Accounts (in GB)',
'admin_settings.others.default_storage' => 'Default Storage Space for New User Accounts (in GB)',
'admin_settings.others.default_storage_plac' => 'Set default storage space in GB',
'admin_settings.others.google_analytics' => 'Google Analytics Code (optional)',
'admin_settings.others.google_analytics_plac' => 'Paste your Google Analytics Code',
@@ -523,5 +523,6 @@ return [
'set_up_2fa_app' => 'Set up Your Authenticator App',
'confirm_your_code' => 'Confirm Your Code',
'paste_code_from_2fa_app' => 'Paste the latest code from 2fa app...',
'configure_your_credentials' => 'Configure Your Credentials',
],
];

8
public/mix-manifest.json
View File

@@ -1,7 +1,7 @@
{
"/js/main.js": "/js/main.js",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=951b690c573510e5",
"/chunks/status-check.js": "/chunks/status-check.js?id=1cf200b6f9e74a09",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=ba76b9a8adbfdc0b",
"/chunks/database.js": "/chunks/database.js?id=a44a44e6daa14a92",
"/chunks/environment.js": "/chunks/environment.js?id=00bcaa788b606272",
@@ -19,13 +19,13 @@
"/chunks/user-create.js": "/chunks/user-create.js?id=40254ae98547761e",
"/chunks/user.js": "/chunks/user.js?id=052364b014015a4d",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=fc5475489f0cec6a",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=cd17c66dc9a7bf78",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=fe30d57494062cf1",
"/chunks/user-password.js": "/chunks/user-password.js?id=900ae71c3d4199ea",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=a3091617207684e5",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=4ff5c1e5bbb0aed8",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=8ba3feb2cc81a2c3",
"/chunks/app-environment.js": "/chunks/app-environment.js?id=d5fbb0ea9249ce7f",
"/chunks/app-others.js": "/chunks/app-others.js?id=f2141c08fb258235",
"/chunks/app-others.js": "/chunks/app-others.js?id=fd8b52f1581e3cdf",
"/chunks/app-server.js": "/chunks/app-server.js?id=ff66d34e90ff98a0",
"/chunks/app-language.js": "/chunks/app-language.js?id=041070825d222906",
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=b11c04d73c59a232",
@@ -35,7 +35,7 @@
"/chunks/settings.js": "/chunks/settings.js?id=3b8e3ced294dc6b2",
"/chunks/profile.js": "/chunks/profile.js?id=5f1e6f1817817716",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=092e324aad54656b",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=9da75055197ac23c",
"/chunks/platform.js": "/chunks/platform.js?id=9dfb7ec9acf3fade",
"/chunks/files.js": "/chunks/files.js?id=05a249346211c989",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=ca1063798b010a2d",

1
resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue
View File

@@ -61,6 +61,7 @@
<AppInputSwitch
:description="$t('admin_settings.others.storage_limit_help')"
:title="$t('admin_settings.others.storage_limit')"
:is-last="! app.storageLimitation"
>
<SwitchInput
v-model="app.storageLimitation"

4
resources/js/views/Admin/Users/UserTabs/UserStorage.vue
View File

@@ -57,9 +57,7 @@
</b>
<b
v-if="
config.subscriptionType === 'fixed' || (config.subscriptionType === 'none' && config.storageLimit)
"
v-if="config.storageLimit"
class="mt-0.5 block text-sm dark:text-gray-500 text-gray-400"
>
{{ $t('total_of', {capacity: storage.data.attributes.capacity}) }}

3
resources/js/views/SetupWizard/StatusCheck.vue
View File

@@ -247,7 +247,8 @@ export default {
)
if (writeCheck && modulesCheck && iniCheck && this.apiRunning && this.phpVersion.acceptable) {
this.$router.push({ name: 'PurchaseCode' })
//this.$router.push({ name: 'PurchaseCode' })
this.$router.push({ name: 'Database' })
} else {
this.isError = true
}

4
resources/js/views/User/Storage.vue
View File

@@ -10,9 +10,7 @@
</b>
<b
v-if="
config.subscriptionType === 'fixed' || (config.subscriptionType === 'none' && config.storageLimit)
"
v-if="config.storageLimit"
class="mt-0.5 block text-sm dark:text-gray-500 text-gray-400"
>
{{ $t('total_of', {capacity: storage.data.attributes.capacity}) }}

10
src/Domain/Admin/Controllers/Users/UserController.php
View File

@@ -52,16 +52,10 @@ class UserController extends Controller
]);
// Register user
try {
$user = ($this->createNewUser)($data);
} catch (MeteredBillingPlanDoesntExist $e) {
return response([
'type' => 'error',
'message' => 'User registrations are temporarily disabled',
], 409);
}
$user = ($this->createNewUser)($data);
// Update user data
$user->role = $data->role;
$user->email_verified_at = now();
$user->save();

4
webpack.mix.js vendored
View File

@@ -25,10 +25,10 @@ mix
chunkFilename: '[name].js?id=[chunkhash]',
}
})
/*.options({
.options({
hmrOptions: {
host: '192.168.1.112',
port: '8080'
},
})*/
})
.disableNotifications();