diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-09 13:03:01 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-12-09 13:03:01 +0100 |
| commit | 81bda7d67c984c9bfcb5bca94e50cec6405b492e (patch) | |
| tree | d9742d61a1f80bd494f8a40305658daef7d3b410 /config | |
| parent | 6b78e5b5ab813625152149b7e215d0568a595cdc (diff) | |
Add setting to not aggregate reblogs (#9248)
* Add setting to not aggregate reblogs Fixes #9222 * Handle cases where user is nil in add_to_home and add_to_list * Add hint for setting_aggregate_reblogs option * Reword setting_aggregate_reblogs label
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 e24d8f4e6..ce6a62e87 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -19,6 +19,7 @@ en: password: Use at least 8 characters phrase: Will be matched regardless of casing in text or content warning of a toot scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. + setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts) setting_default_language: The language of your toots can be detected automatically, but it's not always accurate setting_display_media_default: Hide media marked as sensitive setting_display_media_hide_all: Always hide all media @@ -65,6 +66,7 @@ en: otp_attempt: Two-factor code password: Password phrase: Keyword or phrase + setting_aggregate_reblogs: Group boosts in timelines setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting setting_default_language: Posting language diff --git a/config/settings.yml b/config/settings.yml index 2bc9fe289..4036d419f 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -33,6 +33,7 @@ defaults: &defaults system_font_ui: false noindex: false theme: 'default' + aggregate_reblogs: true notification_emails: follow: false reblog: false |