kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

Merge remote-tracking branch 'misskey/develop' into future-2024-04-25

Browse Source
This commit is contained in:
dakkar
2024-04-25 11:31:35 +01:00
parent ea6629cebf 85339ca751
commit 4fe8a26081
58 changed files with 1305 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/src/pages/settings/drive.vue
+5
View File
@@ -44,6 +44,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts.keepOriginalUploading }}</template>
<template #caption>{{ i18n.ts.keepOriginalUploadingDescription }}</template>
</MkSwitch>
<MkSwitch v-model="keepOriginalFilename">
<template #label>{{ i18n.ts.keepOriginalFilename }}</template>
<template #caption>{{ i18n.ts.keepOriginalFilenameDescription }}</template>
</MkSwitch>
<MkSwitch v-model="alwaysMarkNsfw" @update:modelValue="saveProfile()">
<template #label>{{ i18n.ts.alwaysMarkSensitive }}</template>
</MkSwitch>
@@ -91,6 +95,7 @@ const meterStyle = computed(() => {
});
const keepOriginalUploading = computed(defaultStore.makeGetterSetter('keepOriginalUploading'));
const keepOriginalFilename = computed(defaultStore.makeGetterSetter('keepOriginalFilename'));
misskeyApi('drive').then(info => {
capacity.value = info.capacity;
packages/frontend/src/pages/settings/general.vue
+3
View File
@@ -191,6 +191,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkSwitch v-model="showBots">{{ i18n.ts.showBots }}</MkSwitch>
<MkSwitch v-model="disableStreamingTimeline">{{ i18n.ts.disableStreamingTimeline }}</MkSwitch>
<MkSwitch v-model="enableHorizontalSwipe">{{ i18n.ts.enableHorizontalSwipe }}</MkSwitch>
<MkSwitch v-model="alwaysConfirmFollow">{{ i18n.ts.alwaysConfirmFollow }}</MkSwitch>
</div>
<MkSelect v-model="serverDisconnectedBehavior">
<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
@@ -366,6 +367,7 @@ const showVisibilitySelectorOnBoost = computed(defaultStore.makeGetterSetter('sh
const visibilityOnBoost = computed(defaultStore.makeGetterSetter('visibilityOnBoost'));
const enableHorizontalSwipe = computed(defaultStore.makeGetterSetter('enableHorizontalSwipe'));
const useNativeUIForVideoAudioPlayer = computed(defaultStore.makeGetterSetter('useNativeUIForVideoAudioPlayer'));
const alwaysConfirmFollow = computed(defaultStore.makeGetterSetter('alwaysConfirmFollow'));
watch(lang, () => {
miLocalStorage.setItem('lang', lang.value as string);
@@ -424,6 +426,7 @@ watch([
enableSeasonalScreenEffect,
showVisibilitySelectorOnBoost,
visibilityOnBoost,
alwaysConfirmFollow,
], async () => {
await reloadAsk();
});