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

Merge branch 'develop' into user_management

Browse source 
because
This commit is contained in:
luce 2025-08-06 16:23:36 +02:00
commit eb3d75e6de
29 changed files with 637 additions and 497 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/settings_modal/tabs/filtering_tab.vue
View file

@ -95,8 +95,8 @@
</option>
</Select>
<ul
class="setting-list suboptions"
v-if="onMuteDefaultActionLv1 === 'temporarily'"
class="setting-list suboptions"
>
<li>
<UnitSetting
@ -125,8 +125,8 @@
</option>
</Select>
<ul
class="setting-list suboptions"
v-if="onBlockDefaultActionLv1 === 'temporarily'"
class="setting-list suboptions"
>
<li>
<UnitSetting

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

@ -69,6 +69,22 @@
{{ $t('settings.user_popover_avatar_overlay') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting
path="userCardLeftJustify"
expert="1"
>
{{ $t('settings.user_card_left_justify') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting
path="userCardHidePersonalMarks"
expert="1"
>
{{ $t('settings.user_card_hide_personal_marks') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting
path="alwaysShowNewPostButton"
@ -107,7 +123,10 @@
</BooleanSetting>
</li>
<li>
<BooleanSetting v-if="!blockExpirationSupported" path="modalOnBlock">
<BooleanSetting
v-if="!blockExpirationSupported"
path="modalOnBlock"
>
{{ $t('settings.confirm_dialogs_block') }}
</BooleanSetting>
</li>