17 commits

Author	SHA1	Message	Date
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	a8132690bd	Fix credo	2020-06-04 13:46:13 +04: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	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
rinpatch	165a4b2a69	Do not include activities of invisible users unless explicitly requested ... Closes #1833	2020-06-02 13:34:12 +03:00
Egor Kislitsyn	d1ee3527ef	Move config actions to AdminAPI.ConfigController	2020-05-28 22:23:15 +04: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
lain	ec470c4c77	Merge branch 'openapi/admin/status' into 'develop' ... Add OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2566	2020-05-25 11:40:54 +00: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

Renamed from test/web/admin_api/admin_api_controller_test.exs (Browse further)