aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
AgeCommit message (Collapse)Author
2020-07-14AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpointAlex Gleason
2020-07-08Merge branch '1918-avatar-background-header-reset-2' into 'develop'Haelwenn
Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729
2020-07-07AccountController: Remove unused `update_?` routes.lain
These were not documented and are also not used anymore.
2020-06-29Remove `/statusnet/config`Egor Kislitsyn
2020-06-29Merge branch 'develop' into remove-twitter-apiEgor Kislitsyn
2020-06-25Merge branch 'preload-data' into 'develop'feld
Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381
2020-06-22Add warning against parsing/reusing MastoFE settings blobHaelwenn (lanodan) Monnier
2020-06-12Merge branch 'develop' into preload-dataMark Felder
2020-06-12added admin api for MediaProxy cache invalidationMaksim Pechnikov
2020-06-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-08Merge branch 'openapi/admin/relay' into 'develop'lain
Add OpenAPI spec for AdminAPI.RelayController See merge request pleroma/pleroma!2579
2020-06-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-05Merge branch 'features/apc2s-pagination' into 'develop'Haelwenn
Fix AP C2S pagination Closes #866 and #751 See merge request pleroma/pleroma!2491
2020-06-04Merge branch 'develop' into 'openapi/admin/relay'minibikini
# Conflicts: # lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04Merge branch 'develop' into openapi/admin/relayEgor Kislitsyn
2020-06-04Merge branch 'develop' into openapi/admin/configEgor Kislitsyn
2020-06-03preload data into index.htmlstwf
2020-06-03ChatController: Add function to mark single message as read.lain
2020-06-03Move report actions to AdminAPI.ReportControllerEgor Kislitsyn
2020-06-02Merge branch 'develop' into openapi/admin/relayEgor Kislitsyn
2020-06-02Merge branch 'openapi/admin/oauth-apps' into 'develop'lain
Add OpenAPI spec for AdminAPI.OAuthAppContoller See merge request pleroma/pleroma!2582
2020-06-02Merge branch 'openapi/admin/invites' into 'develop'lain
Add OpenAPI spec for AdminAPI.InviteController See merge request pleroma/pleroma!2585
2020-06-01Merge remote-tracking branch 'origin/develop' into feature/embeddable-postsEgor Kislitsyn
2020-05-29Bugfix: router: allow basic_auth for outboxHaelwenn (lanodan) Monnier
2020-05-28Move config actions to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-26Add AdminAPI.InviteViewEgor Kislitsyn
2020-05-26Move invite actions to AdminAPI.InviteTokenControllerEgor Kislitsyn
2020-05-25Add OpenAPI spec for AdminAPI.OAuthAppContollerEgor Kislitsyn
2020-05-25Add OpenAPI spec for AdminAPI.RelayControllerEgor Kislitsyn
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-25Merge branch 'openapi/admin/status' into 'develop'lain
Add OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2566
2020-05-22ActivityPubController: Add Mastodon activity compat route.lain
2020-05-22ActivityPubController: Add Mastodon compatibility route.lain
2020-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-21Merge branch 'openapi/pleroma-api/pleroma' into 'develop'lain
Add OpenAPI spec for PleromaAPI.PleromaAPIController See merge request pleroma/pleroma!2564
2020-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-21Move status actions to AdminAPI.StatusControllerEgor Kislitsyn
2020-05-20Merge branch 'openapi/pleroma-api/emojis' into 'develop'lain
Add OpenAPI spec for EmojiPackController See merge request pleroma/pleroma!2549
2020-05-20Move notification actions to PleromaAPI.NotificationControllerEgor Kislitsyn
2020-05-20Move conversation actions to PleromaAPI.ConversationControllerEgor Kislitsyn
2020-05-20Move reaction actions to EmojiReactionControllerEgor Kislitsyn
2020-05-19Add OpenAPI spec for PleromaAPI.ScrobbleControllerEgor Kislitsyn
2020-05-18Rename EmojiAPIController to EmojiPackControllerEgor Kislitsyn
2020-05-18Add OpenAPI spec for PleromaAPI.EmojiAPIControllerEgor Kislitsyn
2020-05-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-16Merge branch 'develop' into 'remove-twitter-api'lain
# Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2020-05-14MastodonAPI: /api/v2/media endpointsHaelwenn (lanodan) Monnier
2020-05-12ChatController: Support deletion of chat messages.lain
2020-05-10ChatController: Add GET /chats/:idlain