Commit Graph

83 Commits (b2fed59209a92624884df38a477837cba9a8dbd9)

Author SHA1 Message Date
Alex Gleason 3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
4 years ago
Alex Gleason 0b728ccc44
Pass hackney tls config into email tests, #2101
4 years ago
eugenijm c711a2b157 Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
4 years ago
eugenijm 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
lain 5e3c70afa5 AdminAPI Chat tests: Remove factory.
4 years ago
lain e39ff2616b Admin chat api tests: Small additions.
4 years ago
Alex Gleason c4061f06ba
Merge branch 'chat-moderation-stable' into chat-moderation
4 years ago
Alex Gleason bc86d0a906
Chat moderation: fix formatting
4 years ago
Alex Gleason 9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
4 years ago
Alex Gleason dfb831ca39
Chat moderation: add tests for unauthorized access
4 years ago
Alex Gleason e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
4 years ago
Alex Gleason 67726453f8
Credo fix
4 years ago
Alex Gleason 02d70228b5
AdminAPI: fix delete chat message
4 years ago
Alex Gleason 9dd0b23da4
AdminAPI: show chat
4 years ago
Alex Gleason f13b52a703
AdminAPI: list messages in a chat
4 years ago
Alex Gleason fb0de07343
AdminAPI: list chats for a user
4 years ago
Alex Gleason b40a627ab0
AdminAPI: delete a chat message
4 years ago
rinpatch 126461942b User table: ensure bio is always a string
4 years ago
feld d39abd02ac Merge branch 'relay-fix-admin-fe' into 'develop'
4 years ago
Alexander Strizhakov 1f8c32b773
adding actor type in user show
4 years ago
Alexander Strizhakov 7dc275b69b
relay fix for admin-fe
4 years ago
Alex Gleason c12c576ee2
Also purge bio and display name
4 years ago
Alex Gleason d55faa2f8f
Purge a local user upon deletion, fixes #2062
4 years ago
lain 34b099fffa Merge branch 'issue/1936' into 'develop'
4 years ago
Maksim Pechnikov f6da12f45d fix search media proxy urls
4 years ago
lain 5be25b3e38 Merge branch '1152-deletion' into 'develop'
4 years ago
Maksim Pechnikov 56470647de Merge branch 'develop' into issue/1936
4 years ago
feld dfc56de167 Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
4 years ago
lain 05ff666f99 AdminApiControllerTest: Add test that `deleted` users get deactivated.
4 years ago
lain 686002164a Merge branch '204-fix' into 'develop'
4 years ago
Maksim Pechnikov 345ac512e4 added paginate+search for admin/MediaProxy URLs
4 years ago
Egor Kislitsyn 249f21dcbb Admin API: Filter out unapproved users when the `active` filter is on
4 years ago
Alex Gleason 673e8e3ac1
Force 204 responses to be empty, fixes #2029
4 years ago
Maksim Pechnikov 6e6276b4f8 added test
4 years ago
Maksim Pechnikov cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency
4 years ago
Maksim Pechnikov 15b8446cdb updated dev & test packages
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
lain 250e0369c7 Merge branch 'issue/1878' into 'develop'
4 years ago
Alex Gleason 48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason 20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
4 years ago
Alex Gleason 33f1b29b2c
AdminAPI: Filter users by `need_approval`
4 years ago
Alex Gleason b750129da1
AdminAPI: Return `approval_pending` with users
4 years ago
Alex Gleason a1570ba6ad
AdminAPI: Return `registration_reason` with users
4 years ago
Ivan Tashkinov 124b4709dc [#1940] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.
4 years ago
Ivan Tashkinov cf3f8cb72a [#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
4 years ago
Maksim Pechnikov 62fc8eab0d fix reset confirmation email in admin section
4 years ago
eugenijm c2be0da79f Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
4 years ago
Roman Chvanikov 1471b70ef1 Merge develop
4 years ago
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE
4 years ago
Mark Felder 2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
4 years ago