Skip to content
Snippets Groups Projects
Commit bcae57af authored by kaniini's avatar kaniini
Browse files

Merge branch 'new-frontend-options' into 'develop'

New frontend options

See merge request pleroma/pleroma!383
parents aaf3fc15 3e79d941
Branches
No related tags found
No related merge requests found
......@@ -121,7 +121,9 @@ config :pleroma, :fe,
show_instance_panel: true,
scope_options_enabled: false,
formatting_options_enabled: false,
collapse_message_with_subject: false
collapse_message_with_subject: false,
hide_post_stats: false,
hide_user_stats: false
config :pleroma, :activitypub,
accept_blocks: true,
......
......@@ -177,7 +177,9 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel),
scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
formattingOptionsEnabled: Keyword.get(@instance_fe, :formatting_options_enabled),
collapseMessageWithSubject: Keyword.get(@instance_fe, :collapse_message_with_subject)
collapseMessageWithSubject: Keyword.get(@instance_fe, :collapse_message_with_subject),
hidePostStats: Keyword.get(@instance_fe, :hide_post_stats),
hideUserStats: Keyword.get(@instance_fe, :hide_user_stats)
}
managed_config = Keyword.get(@instance, :managed_config)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment