| 
								
								
									 Egor Kislitsyn | a8132690bd | Fix credo | 2020-06-04 13:46:13 +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 |  | 
				
					
						| 
								
								
									 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 | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 lain | 23e248694d | Announcements: Fix all tests. | 2020-05-21 13:16:21 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 9de9760aa6 | Move status actions to AdminAPI.StatusController | 2020-05-21 13:52:30 +04:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 3c29f4f957 | returning partial chain | 2020-05-15 16:16:02 +03: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 |  | 
				
					
						| 
								
								
									 lain | da550be066 | Merge branch 'fix/1742-random-failing-tests' into 'develop' Fix sporadically failing tests
See merge request pleroma/pleroma!2524 | 2020-05-13 13:38:32 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 712055612f | don't run tests which change env in async | 2020-05-13 11:38:22 +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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 lain | 6c337489f4 | Various testing fixes in relation to user deletion. | 2020-05-03 13:01:19 +02:00 |  | 
				
					
						| 
								
								
									 lain | 6fb96f64c1 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator | 2020-05-03 12:55:29 +02:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | aea781cbd8 | credo fix | 2020-05-01 16:31:05 +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 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | ecf37b46d2 | pagination fix for service users filters | 2020-05-01 14:31:24 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 560f2c1979 | Add OpenAPI spec for ReportController | 2020-04-28 16:50:37 +04:00 |  | 
				
					
						| 
								
								
									 Haelwenn | a17bfb5fab | Merge branch 'feature/1584-client-captcha-options' into 'develop' Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252 | 2020-04-17 09:19:35 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 72ef6cc4f2 | added need_reboot endpoint to admin api | 2020-04-16 16:03:26 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a050f3e015 | fix for logger configuration through admin-fe | 2020-04-13 08:56:28 +03:00 |  | 
				
					
						| 
								
								
									 lain | b87b798ca1 | Merge branch 'fix/1658-invite-send' into 'develop' Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344 | 2020-04-09 10:42:43 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 9795ff5b01 | Apply suggestion to test/web/admin_api/admin_api_controller_test.exs | 2020-04-09 10:17:50 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 365c34a7a9 | Apply suggestion to test/web/admin_api/admin_api_controller_test.exs | 2020-04-09 10:17:44 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 2d64500a9d | error improvement for email_invite endpoint | 2020-04-01 20:26:33 +03:00 |  | 
				
					
						| 
								
								
									 feld | ef7d2b0f11 | Merge branch 'gun' into 'develop' Gun adapter
Closes #945
See merge request pleroma/pleroma!1861 | 2020-04-01 17:05:09 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | b607ae1a1c | removing grouped reports admin api endpoint | 2020-03-30 13:51:45 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | f497cf2f7c | Merge branch 'develop' into gun | 2020-03-30 12:15:23 +03:00 |  |