hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/configurable-pack-extensions' into 'develop'

Browse source 
Make default pack extensions configurable and default to png and gif

See merge request pleroma/pleroma!1338
This commit is contained in:
kaniini 2019-06-26 05:34:02 +00:00
commit 9f8e645dce
4 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/config.md
View file

@ -606,6 +606,7 @@ Configure OAuth 2 provider capabilities:
## :emoji
* `shortcode_globs`: Location of custom emoji files. `*` can be used as a wildcard. Example `["/emoji/custom/**/*.png"]`
* `pack_extensions`: A list of file extensions for emojis, when no emoji.txt for a pack is present. Example `[".png", ".gif"]`
* `groups`: Emojis are ordered in groups (tags). This is an array of key-value pairs where the key is the groupname and the value the location or array of locations. `*` can be used as a wildcard. Example `[Custom: ["/emoji/*.png", "/emoji/custom/*.png"]]`
* `default_manifest`: Location of the JSON-manifest. This manifest contains information about the emoji-packs you can download. Currently only one manifest can be added (no arrays).