Commit Graph

756 Commits (73609211a425922a5068d3912a36b82abe24e12c)

Author SHA1 Message Date
Alex Gleason 73609211a4 Merge branch 'account-notes' into 'develop'
3 years ago
marcin mikołajczak 9775955974 Merge remote-tracking branch 'origin/develop' into remote-follow-api
3 years ago
Alex Gleason 3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
3 years ago
Alex Gleason b0d2b53934 Merge branch 'manifest' into 'develop'
3 years ago
Alex Gleason 1ff9ffed83 Merge branch 'live-dashboard' into 'develop'
3 years ago
Alex Gleason e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
3 years ago
Alex Gleason bd853199d9 Merge branch 'v2-suggestions' into 'develop'
3 years ago
Alex Gleason e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
3 years ago
Alex Gleason 29d80b39f2
Add Phoenix LiveDashboard
3 years ago
Alex Gleason 8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset
3 years ago
Alex Gleason 5da4f33bf1
Restore POST /auth/password
3 years ago
marcin mikołajczak cd5fb84b76 remote_interaction API endpoint
3 years ago
Alex Gleason aee55b9a8b
v2 Suggestions: dismiss a suggestion
3 years ago
Alex Gleason 6c0484d571
AdminAPI: suggest a user through the API
3 years ago
Alex Gleason 7e1caddc58
v2 Suggestions: return empty array
3 years ago
Alex Gleason 720198d569
Merge remote-tracking branch 'pleroma/develop' into manifest
3 years ago
Alex Gleason cb9359335f
Expose /manifest.json for PWA
3 years ago
marcin mikołajczak 40414bf177 MastoAPI: Add user notes on accounts
3 years ago
lain 6e3df11693 Merge branch 'instance-deletion' into 'develop'
3 years ago
Sean King 1841bd8383 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
Alex Gleason b83758bd96
Merge remote-tracking branch 'pleroma/develop' into moderators
3 years ago
Alex Gleason 44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
3 years ago
Alex Gleason 3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
3 years ago
Alex Gleason bad79f79e6
AdminAPI.InstanceController: clean up tests, rename actions
3 years ago
Alex Gleason 54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
3 years ago
Alex Gleason 25676c84be
Create AdminAPI.InstanceController
3 years ago
Alex Gleason 2b3d7794b2
AdminAPI: let moderators actually do things
3 years ago
Alex Gleason 4fe9a758f9
Let moderators manage custom emojis
3 years ago
Alex Gleason 1f093cb216
Moderators: reorganize :admin_api pipeline in Router
3 years ago
Sean King dc4814f0cd
Fix merge conflicts with upstream
3 years ago
Haelwenn 0c56f9de0d Merge branch 'tests/openapi-everywhere' into 'develop'
3 years ago
Alex Gleason 39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
3 years ago
Alex Gleason c23b81e399
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
3 years ago
feld 7ad87571bd Merge branch 'cycles-router' into 'develop'
3 years ago
Alex Gleason bf2ee12fdb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
3 years ago
Alex Gleason fda34591ce
Don't make MediaProxy be a compile-dep of Router
3 years ago
Alex Gleason e885b49e35
Merge remote-tracking branch 'pleroma/develop' into cycles-router
3 years ago
Alex Gleason 21787546c0
Router: move StaticFEPlug to a pipeline
3 years ago
Sean King 4f55d5123b
Remove MastoFE-related backend code and frontend pieces
3 years ago
Alexander Strizhakov 3ec1dbd922
Let pins federate
4 years ago
Haelwenn (lanodan) Monnier a22c53810b
Remove deprecated /api/qvitter/statuses/notifications/read
4 years ago
Egor Kislitsyn 3aae5231b2
Add OpenAPI spec for AdminAPI.UserController
4 years ago
lain 4a9d3a1f28 Merge branch 'features/reports-enhancements' into 'develop'
4 years ago
eugenijm c1d63bbd9a Reroute /api/pleroma to /api/v1/pleroma
4 years ago
Haelwenn (lanodan) Monnier ff72ce31ca
Enhance reports in Pleroma API: index, show
4 years ago
Haelwenn e7b1f0f5f4 Merge branch 'feat/chat-list-pagination' into 'develop'
4 years ago
rinpatch 158f9f18ee Merge branch 'remove-conversation-api' into 'develop'
4 years ago
rinpatch d7ad288c84 Chats: Introduce /api/v2/pleroma/chats which implements pagination
4 years ago
Egor Kislitsyn cf6d3db58f
Add API endpoint to remove a conversation
4 years ago
Ivan Tashkinov df89b5019b [#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
4 years ago