diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-16 06:30:47 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-16 16:11:50 +0200 |
| commit | 729723f857d11434c0f78d63fe16537d77f1c77c (patch) | |
| tree | 9d6518b6ac1d4a5e54d09d214bc7e2a5bbd0ff4b /config | |
| parent | 3598305460bdafe42585191790a9a9e987c8b978 (diff) | |
Add option to disable real-time updates in web UI (#9984)
Fix #9031 Fix #7913
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index b35b9b6ec..3db07cb8b 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -40,6 +40,7 @@ en: setting_show_application: The application you use to toot will be displayed in the detailed view of your toots setting_skin: Reskins the selected Mastodon flavour setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details + setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed username: Your username will be unique on %{domain} whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word featured_tag: @@ -122,6 +123,7 @@ en: setting_system_font_ui: Use system's default font setting_unfollow_modal: Show confirmation dialog before unfollowing someone setting_use_blurhash: Show colorful gradients for hidden media + setting_use_pending_items: Slow mode severity: Severity type: Import type username: Username diff --git a/config/settings.yml b/config/settings.yml index 07e24f8e2..bc97f650b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -37,6 +37,7 @@ defaults: &defaults aggregate_reblogs: true advanced_layout: false use_blurhash: true + use_pending_items: false notification_emails: follow: false reblog: false |