From b5e23152bd1c2ea1091b2785a49e9ab3d0f3fd16 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Mon, 2 Mar 2020 01:16:05 -0600 Subject: clean up timeline scoping & drop timeline options no longer used by monsterfork --- config/locales/en.yml | 6 ------ config/locales/simple_form.en.yml | 1 - config/settings.yml | 2 -- 3 files changed, 9 deletions(-) (limited to 'config') diff --git a/config/locales/en.yml b/config/locales/en.yml index b592f5de5..573c44c7f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -509,12 +509,6 @@ en: show_known_fediverse_at_about_page: desc_html: When toggled, it will show roars from all the known fediverse on preview. Otherwise it will only show local roars. 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 creature page title: Show staff badge diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 224047a69..f840184f1 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -154,7 +154,6 @@ en: setting_boost_interval_to: Maximum boost interval setting_default_local: Default to Monsterpit-only roars (in Glitch flavour) setting_always_local: Don't send your roars outside Monsterpit - setting_rawr_federated: Show raw world timeline (may contain offensive content!) setting_hide_stats: Hide statistics on public pages setting_force_lowercase: make everything lowercase setting_hide_captions: Hide media captions diff --git a/config/settings.yml b/config/settings.yml index 4f4ac0db8..95bae4127 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -63,8 +63,6 @@ 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 default_content_type: 'text/x-bbcode+markdown' auto_reject_unknown: true auto_mark_known: true -- cgit