-
- Downloads
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags See merge request pleroma/pleroma!998
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- config/config.exs 7 additions, 1 deletionconfig/config.exs
- config/emoji.txt 2 additions, 3 deletionsconfig/emoji.txt
- docs/api/pleroma_api.md 3 additions, 3 deletionsdocs/api/pleroma_api.md
- docs/config/custom_emoji.md 37 additions, 2 deletionsdocs/config/custom_emoji.md
- lib/pleroma/emoji.ex 56 additions, 9 deletionslib/pleroma/emoji.ex
- lib/pleroma/formatter.ex 4 additions, 4 deletionslib/pleroma/formatter.ex
- lib/pleroma/web/common_api/common_api.ex 1 addition, 1 deletionlib/pleroma/web/common_api/common_api.ex
- lib/pleroma/web/common_api/utils.ex 1 addition, 1 deletionlib/pleroma/web/common_api/utils.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 3 additions, 2 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
- lib/pleroma/web/twitter_api/controllers/util_controller.ex 7 additions, 1 deletionlib/pleroma/web/twitter_api/controllers/util_controller.ex
- test/emoji_test.exs 106 additions, 0 deletionstest/emoji_test.exs
- test/formatter_test.exs 3 additions, 1 deletiontest/formatter_test.exs
- test/web/mastodon_api/mastodon_api_controller_test.exs 16 additions, 0 deletionstest/web/mastodon_api/mastodon_api_controller_test.exs
- test/web/twitter_api/util_controller_test.exs 21 additions, 0 deletionstest/web/twitter_api/util_controller_test.exs
Loading
Please register or sign in to comment