diff options
| author | scarlett <nia@netbsd.org> | 2018-12-10 23:32:29 +0000 |
|---|---|---|
| committer | scarlett <nia@netbsd.org> | 2018-12-10 23:32:29 +0000 |
| commit | 2999a08e3590c43c623730b0cbf6b93045ac08c1 (patch) | |
| tree | d7155f1de3527f8cfedbbdaadaef1dcaadddc144 /lib | |
| parent | 37bd32e58b4c7b5005b05138d6bbe832dd171095 (diff) | |
| parent | e1cbb183276eb44ae620da5018cb1f6134cadfd4 (diff) | |
| download | pleroma-2999a08e3590c43c623730b0cbf6b93045ac08c1.tar.gz | |
Merge branch 'new-fe-options' into 'develop'
Add new frontend options to server-side config.
See merge request pleroma/pleroma!535
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 0ed519ea6..b1e4c77e8 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -183,7 +183,10 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do formattingOptionsEnabled: Keyword.get(instance_fe, :formatting_options_enabled), 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) + hideUserStats: Keyword.get(instance_fe, :hide_user_stats), + scopeCopy: Keyword.get(instance_fe, :scope_copy), + subjectLineBehavior: Keyword.get(instance_fe, :subject_line_behavior), + alwaysShowSubjectInput: Keyword.get(instance_fe, :always_show_subject_input) } managed_config = Keyword.get(instance, :managed_config) |