-
- Downloads
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
Showing
- config/config.exs 5 additions, 0 deletionsconfig/config.exs
- docs/api/admin_api.md 20 additions, 0 deletionsdocs/api/admin_api.md
- docs/api/differences_in_mastoapi_responses.md 6 additions, 0 deletionsdocs/api/differences_in_mastoapi_responses.md
- docs/config.md 19 additions, 1 deletiondocs/config.md
- lib/mix/tasks/pleroma/instance.ex 34 additions, 0 deletionslib/mix/tasks/pleroma/instance.ex
- lib/mix/tasks/pleroma/robots_txt.eex 2 additions, 0 deletionslib/mix/tasks/pleroma/robots_txt.eex
- lib/pleroma/html.ex 20 additions, 8 deletionslib/pleroma/html.ex
- lib/pleroma/object.ex 5 additions, 0 deletionslib/pleroma/object.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 27 additions, 8 deletionslib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/utils.ex 39 additions, 16 deletionslib/pleroma/web/activity_pub/utils.ex
- lib/pleroma/web/admin_api/admin_api_controller.ex 20 additions, 0 deletionslib/pleroma/web/admin_api/admin_api_controller.ex
- lib/pleroma/web/common_api/common_api.ex 10 additions, 7 deletionslib/pleroma/web/common_api/common_api.ex
- lib/pleroma/web/common_api/utils.ex 10 additions, 2 deletionslib/pleroma/web/common_api/utils.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 15 additions, 7 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
- lib/pleroma/web/mastodon_api/views/status_view.ex 11 additions, 3 deletionslib/pleroma/web/mastodon_api/views/status_view.ex
- lib/pleroma/web/metadata/utils.ex 1 addition, 1 deletionlib/pleroma/web/metadata/utils.ex
- lib/pleroma/web/router.ex 4 additions, 0 deletionslib/pleroma/web/router.ex
- lib/pleroma/web/twitter_api/views/activity_view.ex 3 additions, 3 deletionslib/pleroma/web/twitter_api/views/activity_view.ex
- mix.exs 4 additions, 3 deletionsmix.exs
- mix.lock 2 additions, 1 deletionmix.lock
Loading
Please register or sign in to comment