itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
10136 commits 3 branches 2 tags 277 MiB
Commit graph

270 commits

Author SHA1 Message Date
Egor Kislitsyn
3dd1de61a7 Add url field to AdminAPI.AccountView 2020-06-09 16:02:42 +04: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
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
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
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
lain
1ead5f49b8 AdminApiController: Use common pipeline for user deletion. 2020-05-01 14:30:39 +02:00
lain
ebbd9c7f36 AdminAPIController: Refactor. 2020-05-01 14:22:39 +02:00