-
- Downloads
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
No related branches found
No related tags found
Showing
- .gitignore 4 additions, 0 deletions.gitignore
- CHANGELOG.md 6 additions, 1 deletionCHANGELOG.md
- COPYING 8 additions, 0 deletionsCOPYING
- README.md 1 addition, 1 deletionREADME.md
- config/config.exs 7 additions, 0 deletionsconfig/config.exs
- docs/api/admin_api.md 18 additions, 13 deletionsdocs/api/admin_api.md
- docs/api/differences_in_mastoapi_responses.md 10 additions, 0 deletionsdocs/api/differences_in_mastoapi_responses.md
- docs/config.md 6 additions, 0 deletionsdocs/config.md
- lib/mix/tasks/pleroma/emoji.ex 17 additions, 9 deletionslib/mix/tasks/pleroma/emoji.ex
- lib/mix/tasks/pleroma/user.ex 1 addition, 1 deletionlib/mix/tasks/pleroma/user.ex
- lib/pleroma/activity.ex 47 additions, 0 deletionslib/pleroma/activity.ex
- lib/pleroma/captcha/kocaptcha.ex 1 addition, 1 deletionlib/pleroma/captcha/kocaptcha.ex
- lib/pleroma/conversation.ex 75 additions, 0 deletionslib/pleroma/conversation.ex
- lib/pleroma/conversation/participation.ex 81 additions, 0 deletionslib/pleroma/conversation/participation.ex
- lib/pleroma/object/containment.ex 0 additions, 2 deletionslib/pleroma/object/containment.ex
- lib/pleroma/plugs/oauth_plug.ex 40 additions, 8 deletionslib/pleroma/plugs/oauth_plug.ex
- lib/pleroma/plugs/rate_limit_plug.ex 36 additions, 0 deletionslib/pleroma/plugs/rate_limit_plug.ex
- lib/pleroma/stats.ex 6 additions, 3 deletionslib/pleroma/stats.ex
- lib/pleroma/upload.ex 1 addition, 1 deletionlib/pleroma/upload.ex
- lib/pleroma/uploaders/swift/keystone.ex 2 additions, 2 deletionslib/pleroma/uploaders/swift/keystone.ex
Loading
Please register or sign in to comment