Commit graph

37 commits

Author SHA1 Message Date
Egor Kislitsyn
ad605e3e16
Rename Pleroma.Backup to Pleroma.User.Backup 2020-10-20 17:16:58 +04:00
Mark Felder
1fb9452131 Merge branch 'develop' into feature/account-export 2020-10-14 15:27:15 -05:00
Alexander Strizhakov
9f4fe5485b
alias alphabetically order 2020-10-13 16:43:59 +03:00
Alexander Strizhakov
a6d8cef33e
OAuthScopesPlug module name 2020-10-13 16:43:54 +03:00
Egor Kislitsyn
bc3db72403
Use ModerationLog instead of Logger 2020-10-07 18:35:29 +04:00
Egor Kislitsyn
7c22c9afb4
Allow admins request user backups 2020-10-07 18:34:31 +04:00
Alex Gleason
e229536e5c
Chat Moderation: use explicit sender and recipient fields 2020-09-11 14:11:00 -05:00
Alex Gleason
c41430b23e
Refactor with Chat.for_user_query/1 2020-09-11 14:10:13 -05:00
Alex Gleason
fb0de07343
AdminAPI: list chats for a user 2020-09-11 14:10:05 -05:00
rinpatch
4b76d7ce67 Merge branch 'fix/admin-controller-atom-leak' into 'develop'
Fix atom leak in AdminAPIController

See merge request pleroma/secteam/pleroma!6
2020-09-08 14:00:00 +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
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
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
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
Roman Chvanikov
604a83ae3e merge develop 2020-06-08 19:21:07 +03:00
lain
d192492658 Merge branch 'openapi/admin/relay' into 'develop'
Add OpenAPI spec for AdminAPI.RelayController

See merge request pleroma/pleroma!2579
2020-06-08 11:07:01 +00:00
Egor Kislitsyn
317e2b8d61
Use atoms as keys in ActivityPub.fetch_* functions options 2020-06-04 21:36:26 +04:00
minibikini
b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay'
# Conflicts:
#   lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04 13:29:32 +00:00
Egor Kislitsyn
70f054b083
Merge branch 'develop' into openapi/admin/relay 2020-06-04 13:30:14 +04:00
Egor Kislitsyn
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config 2020-06-04 13:28:00 +04:00
Egor Kislitsyn
9d572f2f66
Move report actions to AdminAPI.ReportController 2020-06-03 19:17:04 +04:00
Egor Kislitsyn
8a43611e01
Use AdminAPI.StatusView in api/admin/users 2020-06-03 14:53:46 +04:00
Egor Kislitsyn
68cb152a08
Merge branch 'develop' into openapi/admin/relay 2020-06-02 18:50:37 +04:00
lain
5da38c15cd Merge branch 'openapi/admin/oauth-apps' into 'develop'
Add OpenAPI spec for AdminAPI.OAuthAppContoller

See merge request pleroma/pleroma!2582
2020-06-02 14:13:24 +00:00
lain
022d975a39 Merge branch 'openapi/admin/invites' into 'develop'
Add OpenAPI spec for AdminAPI.InviteController

See merge request pleroma/pleroma!2585
2020-06-02 14:10:21 +00:00
Egor Kislitsyn
d1ee3527ef
Move config actions to AdminAPI.ConfigController 2020-05-28 22:23:15 +04:00
Alexander Strizhakov
047a11c48f Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex 2020-05-27 10:55:42 +00:00
Alexander Strizhakov
3249141588
validate actor type 2020-05-27 10:14:22 +03:00
Egor Kislitsyn
95ebfb9190
Move invite actions to AdminAPI.InviteTokenController 2020-05-26 15:03:07 +04:00
Egor Kislitsyn
0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller 2020-05-25 22:04:06 +04:00
Egor Kislitsyn
cbcd592300
Add OpenAPI spec for AdminAPI.RelayController 2020-05-25 16:51:16 +04:00
Egor Kislitsyn
9de9760aa6
Move status actions to AdminAPI.StatusController 2020-05-21 13:52:30 +04:00
Renamed from lib/pleroma/web/admin_api/admin_api_controller.ex (Browse further)