Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts: # mix.exs
No related branches found
No related tags found
Showing
- .credo.exs 1 addition, 1 deletion.credo.exs
- .gitlab-ci.yml 3 additions, 2 deletions.gitlab-ci.yml
- config/config.exs 5 additions, 3 deletionsconfig/config.exs
- config/dev.exs 2 additions, 1 deletionconfig/dev.exs
- docs/Clients.md 2 additions, 0 deletionsdocs/Clients.md
- docs/Differences-in-MastodonAPI-Responses.md 11 additions, 0 deletionsdocs/Differences-in-MastodonAPI-Responses.md
- docs/config.md 2 additions, 0 deletionsdocs/config.md
- lib/pleroma/plugs/http_security_plug.ex 17 additions, 2 deletionslib/pleroma/plugs/http_security_plug.ex
- lib/pleroma/uploaders/mdii.ex 1 addition, 1 deletionlib/pleroma/uploaders/mdii.ex
- lib/pleroma/user.ex 4 additions, 3 deletionslib/pleroma/user.ex
- lib/pleroma/user/welcome_message.ex 30 additions, 0 deletionslib/pleroma/user/welcome_message.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 1 addition, 3 deletionslib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex 61 additions, 21 deletionslib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
- lib/pleroma/web/activity_pub/transmogrifier.ex 13 additions, 7 deletionslib/pleroma/web/activity_pub/transmogrifier.ex
- lib/pleroma/web/activity_pub/views/user_view.ex 57 additions, 18 deletionslib/pleroma/web/activity_pub/views/user_view.ex
- lib/pleroma/web/mastodon_api/views/status_view.ex 1 addition, 1 deletionlib/pleroma/web/mastodon_api/views/status_view.ex
- lib/pleroma/web/media_proxy/media_proxy.ex 13 additions, 0 deletionslib/pleroma/web/media_proxy/media_proxy.ex
- lib/pleroma/web/oauth/app.ex 8 additions, 2 deletionslib/pleroma/web/oauth/app.ex
- lib/pleroma/web/oauth/authorization.ex 1 addition, 1 deletionlib/pleroma/web/oauth/authorization.ex
- lib/pleroma/web/oauth/oauth_controller.ex 1 addition, 1 deletionlib/pleroma/web/oauth/oauth_controller.ex
Loading
Please register or sign in to comment