Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
# Conflicts: # test/web/admin_api/admin_api_controller_test.exs
Branches tests-clear-config-tweaks
No related tags found
Showing
- .gitattributes 2 additions, 0 deletions.gitattributes
- docs/API/admin_api.md 14 additions, 6 deletionsdocs/API/admin_api.md
- lib/pleroma/config/transfer_task.ex 1 addition, 3 deletionslib/pleroma/config/transfer_task.ex
- lib/pleroma/html.ex 1 addition, 0 deletionslib/pleroma/html.ex
- lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex 1 addition, 0 deletionslib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
- lib/pleroma/web/activity_pub/mrf/object_age_policy.ex 1 addition, 2 deletionslib/pleroma/web/activity_pub/mrf/object_age_policy.ex
- lib/pleroma/web/activity_pub/mrf/simple_policy.ex 1 addition, 1 deletionlib/pleroma/web/activity_pub/mrf/simple_policy.ex
- lib/pleroma/web/activity_pub/mrf/subchain_policy.ex 1 addition, 1 deletionlib/pleroma/web/activity_pub/mrf/subchain_policy.ex
- lib/pleroma/web/admin_api/admin_api_controller.ex 30 additions, 18 deletionslib/pleroma/web/admin_api/admin_api_controller.ex
- lib/pleroma/web/mastodon_api/views/status_view.ex 1 addition, 3 deletionslib/pleroma/web/mastodon_api/views/status_view.ex
- lib/pleroma/web/metadata/rel_me.ex 4 additions, 2 deletionslib/pleroma/web/metadata/rel_me.ex
- lib/pleroma/web/rel_me.ex 3 additions, 2 deletionslib/pleroma/web/rel_me.ex
- lib/pleroma/web/rich_media/parser.ex 3 additions, 3 deletionslib/pleroma/web/rich_media/parser.ex
- mix.exs 3 additions, 3 deletionsmix.exs
- mix.lock 92 additions, 92 deletionsmix.lock
- priv/static/adminfe/chunk-163c.bd7b8f19.css 0 additions, 1 deletionpriv/static/adminfe/chunk-163c.bd7b8f19.css
- priv/static/adminfe/chunk-18c3.3d138f37.css 0 additions, 1 deletionpriv/static/adminfe/chunk-18c3.3d138f37.css
- priv/static/adminfe/chunk-20e0.ee636d82.css 1 addition, 0 deletionspriv/static/adminfe/chunk-20e0.ee636d82.css
- priv/static/adminfe/chunk-645e.8bb40e00.css 1 addition, 0 deletionspriv/static/adminfe/chunk-645e.8bb40e00.css
- priv/static/adminfe/chunk-b4ba.e2e23716.css 0 additions, 1 deletionpriv/static/adminfe/chunk-b4ba.e2e23716.css
Loading
Please register or sign in to comment