Commit Graph

736 Commits (cb76faece99c706685b71ad5a13943036b481645)

Author SHA1 Message Date
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 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 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
feld f1f773f2c7 Merge branch 'email-stub-in-verify-credentials' into 'develop'
4 years ago
Ivan Tashkinov 60b4654038 Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
4 years ago
Egor Kislitsyn 793fc77b16
Add active user count
4 years ago
Haelwenn (lanodan) Monnier c4439c630f
Bump Copyright to 2021
4 years ago
Ivan Tashkinov e9859b68fc [#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
4 years ago
Ivan Tashkinov 12a5981cc3 Session token setting on token exchange. Auth-related refactoring.
4 years ago
Ivan Tashkinov 489b12cde4 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov ccc2cf0e87 Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
4 years ago
Egor Kislitsyn d26a449396
Change endpoint path
4 years ago
Egor Kislitsyn 08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
Ivan Tashkinov 73e66fd31f Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
lain 504a829edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
4 years ago
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api'
4 years ago
Ivan Tashkinov 04f6b48ac1 Auth subsystem refactoring and tweaks.
4 years ago
Egor Kislitsyn d1698267a2
Fix credo warning
4 years ago
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
feld 1cce1bd729 Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
4 years ago
Egor Kislitsyn 03e306785b
Add an API endpoint to install a new frontend
4 years ago
Maksim Pechnikov cf4f393794 added AdminApi.UserController
4 years ago
Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago