1
0

Merge remote-tracking branch 'origin/merge/2025-03-24-dakkar' into merge/2025-03-24

This commit is contained in:
Hazelnoot
2025-04-13 13:08:00 -04:00
8 changed files with 345 additions and 250 deletions
+10 -8
View File
@@ -70,7 +70,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<SearchMarker :keywords="['account', 'export', 'data']">
<MkFolder>
<template #icon><i class="ph-database ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts._dataRequest.title }}</template>
<template #label><SearchLabel>{{ i18n.ts._dataRequest.title }}</SearchLabel></template>
<div class="_gaps_m">
<FormInfo warn>{{ i18n.ts._dataRequest.warn }}</FormInfo>
@@ -133,13 +133,15 @@ SPDX-License-Identifier: AGPL-3.0-only
<hr>
<FormSection>
<div class="_gaps_s">
<MkSwitch v-model="defaultWithReplies">{{ i18n.ts.withRepliesByDefaultForNewlyFollowed }}</MkSwitch>
<MkButton danger @click="updateRepliesAll(true)"><i class="ph-chats ph-bold ph-lg"></i> {{ i18n.ts.showRepliesToOthersInTimelineAll }}</MkButton>
<MkButton danger @click="updateRepliesAll(false)"><i class="ph-chat ph-bold ph-lg"></i> {{ i18n.ts.hideRepliesToOthersInTimelineAll }}</MkButton>
</div>
</FormSection>
<SearchMarker :keywords="['replies']">
<FormSection>
<div class="_gaps_s">
<MkSwitch v-model="defaultWithReplies"><SearchLabel>{{ i18n.ts.withRepliesByDefaultForNewlyFollowed }}</SearchLabel></MkSwitch>
<MkButton danger @click="updateRepliesAll(true)"><i class="ph-chats ph-bold ph-lg"></i> {{ i18n.ts.showRepliesToOthersInTimelineAll }}</MkButton>
<MkButton danger @click="updateRepliesAll(false)"><i class="ph-chat ph-bold ph-lg"></i> {{ i18n.ts.hideRepliesToOthersInTimelineAll }}</MkButton>
</div>
</FormSection>
</SearchMarker>
<hr>