fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-30 09:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
13604 commits 26 branches 108 tags 316 MiB
Commit graph

372 commits

Author SHA1 Message Date
Alex Gleason dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235 2020-10-13 22:01:27 -05:00
Mark Felder 64553ebae2 Merge branch 'develop' into chore/elixir-1.11 2020-10-13 09:54:53 -05:00
Mark Felder 409f694e4f Merge branch 'develop' into refactor/locked_user_field 2020-10-13 09:54:29 -05:00
Mark Felder 9968b7efed Change user.locked field to user.is_locked 2020-10-13 09:31:13 -05:00
Alexander Strizhakov 5f2071c458
changes after rebase 2020-10-13 16:44:03 +03: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
Alexander Strizhakov b5b4395e4a
oauth consistency 2020-10-13 16:38:18 +03:00
Mark Felder 42e78a08b2 Fix rendering of reports 2020-10-07 12:30:55 -05: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
Maksim Pechnikov de993b856b added force option to the unfollow operation 2020-09-28 09:16:42 +03:00
eugenijm c711a2b157 Return the file content for GET /api/pleroma/admin/instance_document/:document_name 2020-09-17 16:55:53 +03:00
eugenijm 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API 2020-09-17 16:48:07 +03:00
Alex Gleason e229536e5c
Chat Moderation: use explicit sender and recipient fields 2020-09-11 14:11:00 -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 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
Alex Gleason b40a627ab0
AdminAPI: delete a chat message 2020-09-11 14:09:58 -05:00
Alex Gleason f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1 2020-09-11 14:09:50 -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
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
Maksim Pechnikov f6da12f45d fix search media proxy urls 2020-08-16 06:54:48 +03:00
Maksim Pechnikov 345ac512e4 added paginate+search for admin/MediaProxy URLs 2020-08-11 10:30:13 +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
href 4347d2de5e Config/Docs: Expand behaviour suggestions at runtime 2020-07-12 17:23:33 +02: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
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
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 b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys 2020-06-05 23:15:10 +04:00
Haelwenn 54bae06b4f Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1}) 
Unifies all the similar functions to one and simplify some blocks with it.
 2020-06-05 14:48:02 +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 c16315d055
Add OpenAPI spec for AdminAPI.ReportController 2020-06-03 19:17:05 +04:00
Egor Kislitsyn 9d572f2f66
Move report actions to AdminAPI.ReportController 2020-06-03 19:17:04 +04:00
Haelwenn 18b050dfd1 Merge branch 'openapi/update-admin-api/status' into 'develop' 
Update OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2624
 2020-06-03 14:04:12 +00:00
Egor Kislitsyn 8a43611e01
Use AdminAPI.StatusView in api/admin/users 2020-06-03 14:53:46 +04:00
Egor Kislitsyn 7922e63825
Update OpenAPI spec for AdminAPI.StatusController 2020-06-02 19:08:09 +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
lain cd2abcc0e3 Merge branch 'fix/invisible-repeats' into 'develop' 
Do not include activities of invisible users unless explicitly requested

Closes #1833

See merge request pleroma/pleroma!2620
 2020-06-02 11:32:03 +00:00
rinpatch 165a4b2a69 Do not include activities of invisible users unless explicitly requested 
Closes #1833
 2020-06-02 13:34:12 +03:00
lain d111eae798 Merge branch 'feature/status-by-id-account-view' into 'develop' 
another view for account in admin-fe status_show

Closes #1783

See merge request pleroma/pleroma!2543
 2020-06-02 08:49:24 +00:00
Egor Kislitsyn 06f20e9181
Add OpenApi spec to AdminAPI.ConfigController 2020-05-28 23:11:12 +04: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 fca48154a2
Add AdminAPI.InviteView 2020-05-26 15:21:33 +04:00
Egor Kislitsyn 2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController 2020-05-26 15:03:07 +04:00
Egor Kislitsyn 95ebfb9190
Move invite actions to AdminAPI.InviteTokenController 2020-05-26 15:03:07 +04:00
Alexander Strizhakov 8f08384d80
another view for account in admin-fe status_show 2020-05-26 13:48:39 +03: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 45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController 2020-05-21 17:23:12 +04:00
Egor Kislitsyn 9de9760aa6
Move status actions to AdminAPI.StatusController 2020-05-21 13:52:30 +04:00
Roman Chvanikov 01bd6a1e54 Merge branch 'develop' into feature/admin-api-status-count-per-instance 2020-05-18 11:56:27 +03:00
lain 4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop' 
Restricted support for embedded relationships

See merge request pleroma/pleroma!2456
 2020-05-17 07:26:51 +00:00
rinpatch e455ca3f3e Merge branch 'feature/database-configuration-whitelist' into 'develop' 
Database configuration whitelist

See merge request pleroma/pleroma!2522
 2020-05-14 16:07:37 +00:00
Stephanie Wilde-Hobbs 20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
Steph 5c6f575315
Style fixes 2020-05-14 12:15:48 +01:00
Roman Chvanikov 8a383707ae Merge develop 2020-05-13 19:56:40 +03:00
Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs
 2020-05-13 12:42:36 +03:00
Egor Kislitsyn 7803a85d2c
Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
Stephanie Wilde-Hobbs a2fcfc78c9
Filter config descriptions by config whitelist 2020-05-12 21:07:33 +01:00
Stephanie Wilde-Hobbs 620247a015
Add database configuration whitelist 2020-05-12 17:12:27 +01:00
Ivan Tashkinov b960a9430d [#2456] credo fix. 2020-05-10 09:35:12 +03:00
Ivan Tashkinov aee88d11be [#2456] Removed support for embedded relationships in account view. 2020-05-10 09:16:48 +03:00
Ivan Tashkinov 14a49a0483 [#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications. 2020-05-09 18:05:44 +03:00
Roman Chvanikov cbe383ae83 Update stats admin endpoint 2020-05-09 11:30:37 +03:00
Ivan Tashkinov b2924ab1fb Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 2020-05-08 21:37:55 +03:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
rinpatch 473b0d9f3d Merge branch 'feature/delete-validator' into 'develop' 
Move deletions to the common pipeline

Closes #1497

See merge request pleroma/pleroma!2441
 2020-05-06 14:32:58 +00:00
lain c3f1ce80eb Merge branch 'fix/1726-user-pagination' into 'develop' 
Pagination fix for service users filters in admin api

Closes #1726

See merge request pleroma/pleroma!2452
 2020-05-06 09:01:42 +00:00
Alexander Strizhakov e7d8ab8303
admin_api fetch status by id 2020-05-05 16:18:56 +03:00
Ivan Tashkinov d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). 
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
 2020-05-01 18:45:24 +03:00