diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-22 02:07:19 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-22 02:07:19 +0000 |
| commit | 7fcbda702e76b6390076c28832f5aea80086d15a (patch) | |
| tree | 265bf6acf11ad7987850c8733ea1b36248cc8c24 /config/config.exs | |
| parent | 6c0e07b8bdc85f757e2d1e6993e64f2e1540deb6 (diff) | |
| parent | 3cefdc62e0dda75985221853fb123572d6fc068b (diff) | |
| download | pleroma-7fcbda702e76b6390076c28832f5aea80086d15a.tar.gz pleroma-7fcbda702e76b6390076c28832f5aea80086d15a.zip | |
Merge branch 'rework-emoji-management' into 'develop'
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 1114dc84d..9f2244222 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: [ @@ -223,7 +223,6 @@ config :pleroma, :instance, "text/html", "text/markdown" ], - finmoji_enabled: true, mrf_transparency: true, autofollowed_nicknames: [], max_pinned_statuses: 1, |