hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

Browse source 
# Conflicts:
#	mix.exs
This commit is contained in:
Ivan Tashkinov 2019-04-01 08:49:32 +03:00
commit baffdcc480
62 changed files with 3130 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/router.ex
View file

@ -145,6 +145,7 @@ defmodule Pleroma.Web.Router do
pipe_through([:admin_api, :oauth_write])
get("/users", AdminAPIController, :list_users)
get("/users/:nickname", AdminAPIController, :user_show)
delete("/user", AdminAPIController, :user_delete)
patch("/users/:nickname/toggle_activation", AdminAPIController, :user_toggle_activation)
post("/user", AdminAPIController, :user_create)
@ -343,6 +344,7 @@ defmodule Pleroma.Web.Router do
get("/instance", MastodonAPIController, :masto_instance)
get("/instance/peers", MastodonAPIController, :peers)
post("/apps", MastodonAPIController, :create_app)
get("/apps/verify_credentials", MastodonAPIController, :verify_app_credentials)
get("/custom_emojis", MastodonAPIController, :custom_emojis)
get("/statuses/:id/card", MastodonAPIController, :status_card)