-
- Downloads
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex
Showing
- config/config.exs 12 additions, 1 deletionconfig/config.exs
- config/test.exs 1 addition, 1 deletionconfig/test.exs
- docs/Custom-Emoji.md 2 additions, 0 deletionsdocs/Custom-Emoji.md
- docs/Message-Rewrite-Facility-configuration.md 1 addition, 0 deletionsdocs/Message-Rewrite-Facility-configuration.md
- docs/Pleroma-API.md 8 additions, 0 deletionsdocs/Pleroma-API.md
- docs/config.md 23 additions, 0 deletionsdocs/config.md
- lib/pleroma/html.ex 14 additions, 0 deletionslib/pleroma/html.ex
- lib/pleroma/notification.ex 14 additions, 0 deletionslib/pleroma/notification.ex
- lib/pleroma/reverse_proxy.ex 19 additions, 1 deletionlib/pleroma/reverse_proxy.ex
- lib/pleroma/user.ex 4 additions, 0 deletionslib/pleroma/user.ex
- lib/pleroma/user/info.ex 13 additions, 0 deletionslib/pleroma/user/info.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 36 additions, 5 deletionslib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/transmogrifier.ex 34 additions, 0 deletionslib/pleroma/web/activity_pub/transmogrifier.ex
- lib/pleroma/web/activity_pub/utils.ex 7 additions, 1 deletionlib/pleroma/web/activity_pub/utils.ex
- lib/pleroma/web/auth/ldap_authenticator.ex 145 additions, 0 deletionslib/pleroma/web/auth/ldap_authenticator.ex
- lib/pleroma/web/auth/pleroma_authenticator.ex 10 additions, 5 deletionslib/pleroma/web/auth/pleroma_authenticator.ex
- lib/pleroma/web/common_api/common_api.ex 22 additions, 7 deletionslib/pleroma/web/common_api/common_api.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 14 additions, 0 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
- lib/pleroma/web/mastodon_api/views/account_view.ex 1 addition, 1 deletionlib/pleroma/web/mastodon_api/views/account_view.ex
- lib/pleroma/web/oauth/oauth_controller.ex 8 additions, 7 deletionslib/pleroma/web/oauth/oauth_controller.ex
Loading
Please register or sign in to comment