-
- Downloads
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
No related branches found
No related tags found
Showing
- CHANGELOG.md 49 additions, 3 deletionsCHANGELOG.md
- COPYING 2 additions, 2 deletionsCOPYING
- coveralls.json 6 additions, 0 deletionscoveralls.json
- docs/API/admin_api.md 13 additions, 0 deletionsdocs/API/admin_api.md
- docs/API/differences_in_mastoapi_responses.md 11 additions, 7 deletionsdocs/API/differences_in_mastoapi_responses.md
- docs/API/pleroma_api.md 1 addition, 1 deletiondocs/API/pleroma_api.md
- docs/administration/CLI_tasks/emoji.md 2 additions, 2 deletionsdocs/administration/CLI_tasks/emoji.md
- lib/mix/pleroma.ex 0 additions, 1 deletionlib/mix/pleroma.ex
- lib/mix/tasks/pleroma/emoji.ex 49 additions, 31 deletionslib/mix/tasks/pleroma/emoji.ex
- lib/pleroma/ecto_enums.ex 7 additions, 1 deletionlib/pleroma/ecto_enums.ex
- lib/pleroma/following_relationship.ex 45 additions, 6 deletionslib/pleroma/following_relationship.ex
- lib/pleroma/formatter.ex 22 additions, 4 deletionslib/pleroma/formatter.ex
- lib/pleroma/gun/conn.ex 3 additions, 1 deletionlib/pleroma/gun/conn.ex
- lib/pleroma/object/containment.ex 12 additions, 0 deletionslib/pleroma/object/containment.ex
- lib/pleroma/user.ex 19 additions, 19 deletionslib/pleroma/user.ex
- lib/pleroma/user/query.ex 3 additions, 3 deletionslib/pleroma/user/query.ex
- lib/pleroma/user_relationship.ex 19 additions, 10 deletionslib/pleroma/user_relationship.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 16 additions, 1 deletionlib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/builder.ex 43 additions, 0 deletionslib/pleroma/web/activity_pub/builder.ex
- lib/pleroma/web/activity_pub/object_validator.ex 37 additions, 0 deletionslib/pleroma/web/activity_pub/object_validator.ex
Loading
Please register or sign in to comment