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

Merge remote-tracking branch 'origin/develop' into shigusegubu

Browse source 
* origin/develop:
  Update CHANGELOG.md
  undo accidental change when merging
  Improve the user card for deactivated users
  Update CHANGELOG.md
  Update CHANGELOG.md
  Apply 1 suggestion(s) to 1 file(s)
  Allow canceling a follow request
  Simple policy reasons for instance specific policies
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Korean)
  Translated using Weblate (Japanese (ja_PEDANTIC))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Italian)
This commit is contained in:
Henry Jameson 2022-01-24 21:47:34 +02:00
commit 29586795ec
33 changed files with 603 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,6 +196,16 @@
{{ $t('settings.sensitive_by_default') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="alwaysShowNewPostButton">
{{ $t('settings.always_show_post_button') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="autohideFloatingPostButton">
{{ $t('settings.autohide_floating_post_button') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="padEmoji">
{{ $t('settings.pad_emoji') }}