-
- Downloads
Merge branch 'develop' into 'patch-2'
# Conflicts: # mix.exs
No related branches found
No related tags found
Showing
- CONFIGURATION.md 15 additions, 0 deletionsCONFIGURATION.md
- config/config.exs 26 additions, 1 deletionconfig/config.exs
- lib/mix/tasks/generate_invite_token.ex 25 additions, 0 deletionslib/mix/tasks/generate_invite_token.ex
- lib/pleroma/activity.ex 4 additions, 0 deletionslib/pleroma/activity.ex
- lib/pleroma/formatter.ex 24 additions, 3 deletionslib/pleroma/formatter.ex
- lib/pleroma/gopher/server.ex 3 additions, 3 deletionslib/pleroma/gopher/server.ex
- lib/pleroma/object.ex 4 additions, 0 deletionslib/pleroma/object.ex
- lib/pleroma/plugs/digest.ex 10 additions, 0 deletionslib/pleroma/plugs/digest.ex
- lib/pleroma/plugs/http_signature.ex 10 additions, 0 deletionslib/pleroma/plugs/http_signature.ex
- lib/pleroma/upload.ex 28 additions, 14 deletionslib/pleroma/upload.ex
- lib/pleroma/user.ex 2 additions, 1 deletionlib/pleroma/user.ex
- lib/pleroma/user_invite_token.ex 40 additions, 0 deletionslib/pleroma/user_invite_token.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 16 additions, 6 deletionslib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/transmogrifier.ex 52 additions, 19 deletionslib/pleroma/web/activity_pub/transmogrifier.ex
- lib/pleroma/web/activity_pub/utils.ex 1 addition, 1 deletionlib/pleroma/web/activity_pub/utils.ex
- lib/pleroma/web/activity_pub/views/user_view.ex 3 additions, 8 deletionslib/pleroma/web/activity_pub/views/user_view.ex
- lib/pleroma/web/common_api/common_api.ex 5 additions, 5 deletionslib/pleroma/web/common_api/common_api.ex
- lib/pleroma/web/endpoint.ex 2 additions, 1 deletionlib/pleroma/web/endpoint.ex
- lib/pleroma/web/federator/federator.ex 1 addition, 1 deletionlib/pleroma/web/federator/federator.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 69 additions, 6 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Loading
Please register or sign in to comment