projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/replace-ws' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index fcad55bbedd43c5244f8b972aa8086eada8e82db..1a9738cff4676551ea2f72c7c8b50d562be37195 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-100,10
+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`
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/
vaartis
/emoji-index/raw/master/index.json"
+ default_manifest: "https://git.pleroma.social/
pleroma
/emoji-index/raw/master/index.json"
config :pleroma, :uri_schemes,
valid_schemes: [
config :pleroma, :uri_schemes,
valid_schemes: [
@@
-222,9
+221,9
@@
config :pleroma, :instance,
allowed_post_formats: [
"text/plain",
"text/html",
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,
mrf_transparency: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
@@
-232,7
+231,8
@@
config :pleroma, :instance,
welcome_user_nickname: nil,
welcome_message: nil,
max_report_comment_size: 1000,
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
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
@@
-327,7
+327,8
@@
config :pleroma, :media_proxy,
follow_redirect: true,
pool: :media
]
follow_redirect: true,
pool: :media
]
- ]
+ ],
+ whitelist: []
config :pleroma, :chat, enabled: true
config :pleroma, :chat, enabled: true