diff options
author | kaniini <nenolod@gmail.com> | 2018-09-16 01:05:09 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-09-16 01:05:09 +0000 |
commit | c2650f0ffb5938005baf437dfa69bbf05da0cc71 (patch) | |
tree | f0b86511148be7e631697cb0f25af5dfebae66fe /config/config.exs | |
parent | 90661e20cf91b2b1e95fdee73f2e95aa18c1be65 (diff) | |
parent | e82ce2a4b396e448181c7729db6dd850944db140 (diff) | |
download | pleroma-c2650f0ffb5938005baf437dfa69bbf05da0cc71.tar.gz pleroma-c2650f0ffb5938005baf437dfa69bbf05da0cc71.zip |
Merge branch 'feature/html-scrub-policy' into 'develop'
html scrub policy
See merge request pleroma/pleroma!339
Diffstat (limited to 'config/config.exs')
-rw-r--r-- | config/config.exs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index ed718c3d3..d5c5b7902 100644 --- a/config/config.exs +++ b/config/config.exs @@ -76,6 +76,15 @@ config :pleroma, :instance, quarantined_instances: [], managed_config: true +config :pleroma, :markup, + # XXX - unfortunately, inline images must be enabled by default right now, because + # of custom emoji. Issue #275 discusses defanging that somehow. + allow_inline_images: true, + allow_headings: false, + allow_tables: false, + allow_fonts: false, + scrub_policy: Pleroma.HTML.Scrubber.Default + config :pleroma, :fe, theme: "pleroma-dark", logo: "/static/logo.png", |