diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-05 21:17:46 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-05 21:17:46 +0000 |
| commit | 614e47aa7c7f44249961213905860d3076326977 (patch) | |
| tree | 02f4173dd2d6c7540021df04a88b4e8943fc2f33 /config | |
| parent | f7ba393bb94f29bb79bc34ff3c708f929f61cc57 (diff) | |
| parent | 497814cbbb4baea91b2882fbddd5cd8d5ad6e170 (diff) | |
| download | pleroma-614e47aa7c7f44249961213905860d3076326977.tar.gz pleroma-614e47aa7c7f44249961213905860d3076326977.zip | |
Merge branch 'revert-d31bbb1c' into 'develop'
Rich Text Redo Branch
See merge request pleroma/pleroma!314
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 2290119f7..608c035b0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -74,7 +74,12 @@ config :pleroma, :instance, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, public: true, quarantined_instances: [], - managed_config: true + managed_config: true, + allowed_post_formats: [ + "text/plain", + "text/html", + "text/markdown" + ] config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because @@ -98,6 +103,7 @@ config :pleroma, :fe, redirect_root_login: "/main/friends", show_instance_panel: true, scope_options_enabled: false, + formatting_options_enabled: false, collapse_message_with_subject: false config :pleroma, :activitypub, |