hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

local merge conflict resolution

Browse source
This commit is contained in:
Henry Jameson 2022-02-28 18:32:57 +02:00
commit 0c8a018376
2 changed files with 57 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/components/settings_modal/tabs/general_tab.vue
View file

@ -185,6 +185,42 @@
{{ $t('settings.play_videos_in_modal') }}
</BooleanSetting>
</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>
<label for="maxDepthInThread">
{{ $t('settings.max_depth_in_thread') }}
</label>
<input
id="maxDepthInThread"
path.number="maxDepthInThread"
class="number-input"
type="number"
min="3"
step="1"
>
</li>
<li>
<ChoiceSetting
id="conversationOtherRepliesButton"
path="conversationOtherRepliesButton"
:options="conversationOtherRepliesButtonOptions"
>
{{ $t('settings.conversation_other_replies_button') }}
</ChoiceSetting>
</li>
</ul>
<h3>{{ $t('settings.mention_links') }}</h3>
<li>
<ChoiceSetting