diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-30 20:17:52 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-30 20:17:52 +0700 |
| commit | 0f0cc2703b7ffb99c58e72782925ea4dd61db41d (patch) | |
| tree | f640d180d16797a6da98a7d1e1cb7c6fb6350392 /config/config.exs | |
| parent | b87ad13803df59d88feb736c3d0ff9cf514989d7 (diff) | |
| parent | 32a4501d2d1cdfef68cbde236482e0c84cce3a7a (diff) | |
| download | pleroma-0f0cc2703b7ffb99c58e72782925ea4dd61db41d.tar.gz pleroma-0f0cc2703b7ffb99c58e72782925ea4dd61db41d.zip | |
Merge develop
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index b1d506b59..eeaaedf48 100644 --- a/config/config.exs +++ b/config/config.exs @@ -100,9 +100,9 @@ config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], groups: [ # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` - Finmoji: "/finmoji/128px/*-128.png", - Custom: ["/emoji/*.png", "/emoji/custom/*.png"] - ] + Custom: ["/emoji/*.png", "/emoji/**/*.png"] + ], + default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json" config :pleroma, :uri_schemes, valid_schemes: [ @@ -221,9 +221,9 @@ config :pleroma, :instance, allowed_post_formats: [ "text/plain", "text/html", - "text/markdown" + "text/markdown", + "text/bbcode" ], - finmoji_enabled: true, mrf_transparency: true, autofollowed_nicknames: [], max_pinned_statuses: 1, @@ -231,7 +231,8 @@ config :pleroma, :instance, welcome_user_nickname: nil, welcome_message: nil, max_report_comment_size: 1000, - safe_dm_mentions: false + safe_dm_mentions: false, + healthcheck: false config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because @@ -326,7 +327,8 @@ config :pleroma, :media_proxy, follow_redirect: true, pool: :media ] - ] + ], + whitelist: [] config :pleroma, :chat, enabled: true |