Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,428 Commits 1 Branch 0 Tags 222 MiB
e229536e5c
Commit Graph

310 Commits

Author SHA1 Message Date
Alex Gleason
e229536e5c
Chat Moderation: use explicit sender and recipient fields 2020-09-11 14:11:00 -05:00
Alex Gleason
67726453f8
Credo fix 2020-09-11 14:10:52 -05:00
Alex Gleason
02d70228b5
AdminAPI: fix delete chat message 2020-09-11 14:10:35 -05:00
Alex Gleason
9dd0b23da4
AdminAPI: show chat 2020-09-11 14:10:28 -05:00
Alex Gleason
f13b52a703
AdminAPI: list messages in a chat 2020-09-11 14:10:19 -05:00
Alex Gleason
fb0de07343
AdminAPI: list chats for a user 2020-09-11 14:10:05 -05:00
Alex Gleason
b40a627ab0
AdminAPI: delete a chat message 2020-09-11 14:09:58 -05:00
feld
d39abd02ac Merge branch 'relay-fix-admin-fe' into 'develop' 
Relay fix for admin-fe

See merge request pleroma/pleroma!2902
 2020-08-24 17:03:18 +00:00
Alexander Strizhakov
1f8c32b773
adding actor type in user show 2020-08-21 10:38:56 +03:00
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe 2020-08-19 08:41:39 +03:00
Alex Gleason
c12c576ee2
Also purge bio and display name 2020-08-17 22:11:45 -05:00
Alex Gleason
d55faa2f8f
Purge a local user upon deletion, fixes #2062 2020-08-17 21:52:28 -05:00
lain
34b099fffa Merge branch 'issue/1936' into 'develop' 
[#1936] Ability to search for banned MediaProxy URLs 

See merge request pleroma/pleroma!2873
 2020-08-17 13:05:20 +00:00
Maksim Pechnikov
f6da12f45d fix search media proxy urls 2020-08-16 06:54:48 +03:00
lain
5be25b3e38 Merge branch '1152-deletion' into 'develop' 
User deletion issue exploration

See merge request pleroma/pleroma!2879
 2020-08-13 09:06:33 +00:00
Maksim Pechnikov
56470647de Merge branch 'develop' into issue/1936 2020-08-13 09:00:25 +03:00
feld
dfc56de167 Merge branch 'feature/update-welcome-setting-in-description' into 'develop' 
Update :welcome settings in description.exs

Closes #2024

See merge request pleroma/pleroma!2843
 2020-08-12 16:18:40 +00:00
lain
05ff666f99 AdminApiControllerTest: Add test that deleted users get deactivated. 2020-08-12 16:31:00 +02:00
lain
686002164a Merge branch '204-fix' into 'develop' 
Fix 500 errors when returning :no_content, fixes #2029

Closes #2029

See merge request pleroma/pleroma!2856
 2020-08-11 09:18:56 +00:00
Maksim Pechnikov
345ac512e4 added paginate+search for admin/MediaProxy URLs 2020-08-11 10:30:13 +03:00
Egor Kislitsyn
249f21dcbb Admin API: Filter out unapproved users when the active filter is on 2020-08-10 18:27:39 +04:00
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029 2020-08-07 13:02:39 -05:00
Maksim Pechnikov
6e6276b4f8 added test 2020-08-07 09:47:05 +03:00
Maksim Pechnikov
cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency 2020-07-30 08:52:13 +03:00
Maksim Pechnikov
15b8446cdb updated dev & test packages 2020-07-29 06:47:56 +03:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-26 15:46:14 -05:00
lain
76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop' 
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting

Closes #1973

See merge request pleroma/pleroma!2791
 2020-07-23 12:52:02 +00:00
Ivan Tashkinov
9ea51a6de5 [#2791] AccountView: renamed :force option to :skip_visibility_check. 2020-07-23 15:08:30 +03:00
lain
250e0369c7 Merge branch 'issue/1878' into 'develop' 
[#1878] fix reset confirmation email in admin section

See merge request pleroma/pleroma!2751
 2020-07-23 10:56:33 +00:00
Ivan Tashkinov
6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. 
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
 2020-07-22 19:06:00 +03:00
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-14 18:56:40 -05:00
Alex Gleason
20d24741af
AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint 2020-07-14 18:02:44 -05:00
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by need_approval 2020-07-14 14:29:03 -05:00
Alex Gleason
b750129da1
AdminAPI: Return approval_pending with users 2020-07-14 13:47:05 -05:00
Alex Gleason
a1570ba6ad
AdminAPI: Return registration_reason with users 2020-07-14 13:08:39 -05:00
Ivan Tashkinov
124b4709dc [#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations. 2020-07-14 19:31:05 +03:00
Ivan Tashkinov
cf3f8cb72a [#1940] Reinstated OAuth-less admin_token authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence). 2020-07-19 21:35:57 +03:00
Maksim Pechnikov
62fc8eab0d fix reset confirmation email in admin section 2020-07-11 07:20:35 +03:00
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 2020-07-09 14:57:40 +03:00
Roman Chvanikov
1471b70ef1 Merge develop 2020-06-23 20:56:55 +03:00
Alexander Strizhakov
c5863438ba
proper error codes for error in adminFE 2020-06-20 13:53:57 +03:00
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 2020-06-17 13:13:55 -05:00
Mark Felder
3462d4b995 Merge branch 'develop' into issue/1855 2020-06-17 12:50:06 -05:00
Maksim
6d33a3a51b Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs 2020-06-17 12:58:28 +00:00
Maksim
793a53f1ec Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs 2020-06-17 12:58:16 +00:00
Maksim
1b45bc7b2a Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs 2020-06-17 12:58:08 +00:00
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples 2020-06-16 15:53:28 +03:00
Maksim Pechnikov
62b8c31b7a added tests 2020-06-15 14:55:00 +03:00
Maksim Pechnikov
f9dcf15ecb added admin api for MediaProxy cache invalidation 2020-06-12 14:49:54 +03:00
Egor Kislitsyn
3dd1de61a7 Add url field to AdminAPI.AccountView 2020-06-09 16:02:42 +04:00