diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-13 17:31:46 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-13 17:31:46 +0000 |
| commit | e34d71fc1f64fde73e435262979e5e93ebd37df2 (patch) | |
| tree | 8b43c0e6f070c7f5a5fd72d1fcc986ca52524ed2 /src/components/settings_modal/tabs/general_tab.vue | |
| parent | 89efb0d2f4ab41eb020e6a6b7bb14dbe20e53157 (diff) | |
| parent | 551b8f3690bab1f53ec22ccf6963009a30fa45d0 (diff) | |
Merge branch 'from/develop/tusooa/tree-threading' into 'develop'
Add the option to display threads as trees
See merge request pleroma/pleroma-fe!1407
Diffstat (limited to 'src/components/settings_modal/tabs/general_tab.vue')
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index eba3b268..ba01fdeb 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -154,6 +154,47 @@ </li> <li> <ChoiceSetting + id="conversationDisplay" + path="conversationDisplay" + :options="conversationDisplayOptions" + > + {{ $t('settings.conversation_display') }} + </ChoiceSetting> + </li> + <ul + v-if="conversationDisplay !== 'linear'" + class="setting-list suboptions" + > + <li> + <BooleanSetting path="conversationTreeAdvanced"> + {{ $t('settings.tree_advanced') }} + </BooleanSetting> + </li> + <li> + <BooleanSetting path="conversationTreeFadeAncestors"> + {{ $t('settings.tree_fade_ancestors') }} + </BooleanSetting> + </li> + <li> + <IntegerSetting + path="maxDepthInThread" + :min="3" + > + {{ $t('settings.max_depth_in_thread') }} + </IntegerSetting> + </li> + <li> + <ChoiceSetting + id="conversationOtherRepliesButton" + path="conversationOtherRepliesButton" + :options="conversationOtherRepliesButtonOptions" + > + {{ $t('settings.conversation_other_replies_button') }} + </ChoiceSetting> + </li> + </ul> + <li> + <ChoiceSetting id="mentionLinkDisplay" path="mentionLinkDisplay" :options="mentionLinkDisplayOptions" |