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

Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

Browse source
This commit is contained in:
Ivan Tashkinov 2020-11-04 17:48:10 +03:00
commit 73e66fd31f
45 changed files with 1177 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -242,6 +242,8 @@ defmodule Pleroma.Web.Router do
get("/chats/:id", ChatController, :show)
get("/chats/:id/messages", ChatController, :messages)
delete("/chats/:id/messages/:message_id", ChatController, :delete_message)
post("/backups", AdminAPIController, :create_backup)
end
scope "/api/pleroma/emoji", Pleroma.Web.PleromaAPI do
@ -372,6 +374,9 @@ defmodule Pleroma.Web.Router do
put("/mascot", MascotController, :update)
post("/scrobble", ScrobbleController, :create)
get("/backups", BackupController, :index)
post("/backups", BackupController, :create)
end
scope [] do