Merge branch 'develop' into 'themeApply'

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
HJ 2021-09-09 21:51:39 +00:00
commit 370f1e55ad
83 changed files with 4489 additions and 1043 deletions

View file

@ -122,6 +122,11 @@
{{ $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') }}

View file

@ -475,7 +475,7 @@ export default {
this.loadThemeFromLocalStorage(false, true)
break
case 'file':
console.err('Forcing snapshout from file is not supported yet')
console.error('Forcing snapshot from file is not supported yet')
break
}
this.dismissWarning()