Merge remote-tracking branch 'remotes/upstream/master'

This commit is contained in:
Toni Barth 2024-06-06 17:33:27 +02:00
commit fbed92dacf
68 changed files with 6264 additions and 1208 deletions

View file

@ -4,7 +4,7 @@
<div class="w-full border border-white/10 rounded-xl p-4 my-4 bg-primary/25">
<div class="flex items-center">
<ui-checkbox v-model="showCustomLoginMessage" checkbox-bg="bg" />
<p class="text-lg pl-4">Custom Message on Login</p>
<p class="text-lg pl-4">{{ $strings.HeaderCustomMessageOnLogin }}</p>
</div>
<transition name="slide">
<div v-if="showCustomLoginMessage" class="w-full pt-4">

View file

@ -20,13 +20,30 @@
</div>
<div class="flex items-center mb-2 py-3">
<ui-toggle-switch labeledBy="email-settings-secure" v-model="newSettings.secure" :disabled="savingSettings" />
<ui-tooltip :text="$strings.LabelEmailSettingsSecureHelp">
<div class="pl-4 flex items-center">
<span id="email-settings-secure">{{ $strings.LabelEmailSettingsSecure }}</span>
<span class="material-icons text-lg pl-1">info_outlined</span>
<div class="w-full md:w-1/2 px-1">
<!-- secure toggle -->
<div class="flex items-center">
<ui-toggle-switch labeledBy="email-settings-secure" v-model="newSettings.secure" :disabled="savingSettings" />
<ui-tooltip :text="$strings.LabelEmailSettingsSecureHelp">
<div class="pl-4 flex items-center">
<span id="email-settings-secure">{{ $strings.LabelEmailSettingsSecure }}</span>
<span class="material-icons text-lg pl-1">info_outlined</span>
</div>
</ui-tooltip>
</div>
</ui-tooltip>
</div>
<div class="w-full md:w-1/2 px-1">
<!-- reject unauthorized toggle -->
<div class="flex items-center">
<ui-toggle-switch labeledBy="email-settings-reject-unauthorized" v-model="newSettings.rejectUnauthorized" :disabled="savingSettings" />
<ui-tooltip :text="$strings.LabelEmailSettingsRejectUnauthorizedHelp">
<div class="pl-4 flex items-center">
<span id="email-settings-reject-unauthorized">{{ $strings.LabelEmailSettingsRejectUnauthorized }}</span>
<span class="material-icons text-lg pl-1">info_outlined</span>
</div>
</ui-tooltip>
</div>
</div>
</div>
<div class="flex items-center -mx-1 mb-2">
@ -119,6 +136,7 @@ export default {
host: null,
port: 465,
secure: true,
rejectUnauthorized: true,
user: null,
pass: null,
testAddress: null,
@ -257,6 +275,7 @@ export default {
host: this.newSettings.host,
port: this.newSettings.port,
secure: this.newSettings.secure,
rejectUnauthorized: this.newSettings.rejectUnauthorized,
user: this.newSettings.user,
pass: this.newSettings.pass,
testAddress: this.newSettings.testAddress,

View file

@ -368,7 +368,8 @@ export default {
},
purgeItemsCache() {
const payload = {
message: `<span class="text-warning text-base">Warning! This will delete the entire folder at /metadata/cache/items.</span><br />Are you sure you want to purge items cache?`,
// message: `This will delete the entire folder at <code>/metadata/cache/items</code>.<br />Are you sure you want to purge items cache?`,
message: this.$strings.MessageConfirmPurgeItemsCache,
callback: (confirmed) => {
if (confirmed) {
this.sendPurgeItemsCache()