-
- Downloads
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- config/config.exs 24 additions, 1 deletionconfig/config.exs
- config/dev.exs 0 additions, 1 deletionconfig/dev.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.md 68 additions, 7 deletionsdocs/config.md
- docs/config/custom_emoji.md 37 additions, 2 deletionsdocs/config/custom_emoji.md
- lib/pleroma/config.ex 4 additions, 0 deletionslib/pleroma/config.ex
- lib/pleroma/emoji.ex 56 additions, 9 deletionslib/pleroma/emoji.ex
- lib/pleroma/formatter.ex 4 additions, 4 deletionslib/pleroma/formatter.ex
- lib/pleroma/registration.ex 57 additions, 0 deletionslib/pleroma/registration.ex
- lib/pleroma/user.ex 13 additions, 5 deletionslib/pleroma/user.ex
- lib/pleroma/web/activity_pub/transmogrifier.ex 8 additions, 18 deletionslib/pleroma/web/activity_pub/transmogrifier.ex
- lib/pleroma/web/activity_pub/utils.ex 4 additions, 1 deletionlib/pleroma/web/activity_pub/utils.ex
- lib/pleroma/web/auth/authenticator.ex 23 additions, 3 deletionslib/pleroma/web/auth/authenticator.ex
- lib/pleroma/web/auth/ldap_authenticator.ex 11 additions, 4 deletionslib/pleroma/web/auth/ldap_authenticator.ex
- lib/pleroma/web/auth/pleroma_authenticator.ex 64 additions, 2 deletionslib/pleroma/web/auth/pleroma_authenticator.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/endpoint.ex 14 additions, 4 deletionslib/pleroma/web/endpoint.ex
Loading
Please register or sign in to comment