about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-04-30 21:51:24 +0200
committerThibG <thib@sitedethib.com>2019-05-01 22:33:09 +0200
commitfcbf557bd2c4db3734e328ffe434895457836478 (patch)
tree0a9926a3a39857e1f9ea25fd5e197fa94993d6f1 /config
parentcc5a81b7d87fbd0db67781ebc21e3805876fbb74 (diff)
Add site-wide options to show reblogs and replies in local/public timelines
Fixes #1021
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml6
-rw-r--r--config/settings.yml2
2 files changed, 8 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5ec70a675..20a75e60c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -438,6 +438,12 @@ en:
       show_known_fediverse_at_about_page:
         desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots.
         title: Show known fediverse on timeline preview
+      show_reblogs_in_public_timelines:
+        desc_html: Show public boosts of public toots in local and public timelines.
+        title: Show boosts in public timelines
+      show_replies_in_public_timelines:
+        desc_html: In addition to public self-replies (threads), show public replies in local and public timelines.
+        title: Show replies in public timelines
       show_staff_badge:
         desc_html: Show a staff badge on a user page
         title: Show staff badge
diff --git a/config/settings.yml b/config/settings.yml
index f0bfa9b69..c3aeab551 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -62,6 +62,8 @@ defaults: &defaults
   activity_api_enabled: true
   peers_api_enabled: true
   show_known_fediverse_at_about_page: true
+  show_reblogs_in_public_timelines: false
+  show_replies_in_public_timelines: false
 
 development:
   <<: *defaults