lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6e3df11693 
								
							 
						 
						
							
							
								
								Merge branch 'instance-deletion' into 'develop'  
							
							... 
							
							
							
							AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483  
							
						 
						
							2021-11-15 14:24:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								f9bafc17fb 
								
							 
						 
						
							
							
								
								List available frontends also when no static/frontends folder is present yet  
							
							... 
							
							
							
							* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already 
							
						 
						
							2021-08-14 18:42:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7247c29653 
								
							 
						 
						
							
							
								
								AdminAPI: hotfix for nil report objects  
							
							
							
						 
						
							2021-08-11 09:42:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3674179b26 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into instance-deletion  
							
							
							
						 
						
							2021-07-17 15:03:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bad79f79e6 
								
							 
						 
						
							
							
								
								AdminAPI.InstanceController: clean up tests, rename actions  
							
							
							
						 
						
							2021-07-17 15:00:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54dbcfe02a 
								
							 
						 
						
							
							
								
								AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance  
							
							
							
						 
						
							2021-07-17 14:55:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								25676c84be 
								
							 
						 
						
							
							
								
								Create AdminAPI.InstanceController  
							
							
							
						 
						
							2021-07-17 13:05:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								3f58213646 
								
							 
						 
						
							
							
								
								Merge branch 'admin-api-users-sort' into 'develop'  
							
							... 
							
							
							
							AdminAPI: sort new users at the top
Closes  #2709 
See merge request pleroma/pleroma!3481  
							
						 
						
							2021-07-14 14:39:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1a2fe96d56 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date  
							
							
							
						 
						
							2021-07-14 09:02:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								167e14416b 
								
							 
						 
						
							
							
								
								AdminAPI: add date to users  
							
							
							
						 
						
							2021-07-14 08:54:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								deb3f91136 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort  
							
							
							
						 
						
							2021-07-13 22:47:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e88796784 
								
							 
						 
						
							
							
								
								AdminAPI: sort user results by ID descending  
							
							
							
						 
						
							2021-07-13 22:47:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4faeec2c44 
								
							 
						 
						
							
							
								
								Create AdminAPI.UserView to avoid compile-time dep  
							
							... 
							
							
							
							Speeds up recompilation 
							
						 
						
							2021-06-08 16:34:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d87dfcb5f0 
								
							 
						 
						
							
							
								
								Put custom guards in Web.Utils.Guards  
							
							... 
							
							
							
							Speeds up recompilation by removing a compile-time cycle on AdminAPI.Search 
							
						 
						
							2021-06-07 15:51:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c96c82b5b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-views  
							
							
							
						 
						
							2021-05-29 12:17:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9e4200ed2 
								
							 
						 
						
							
							
								
								Create real Views for all Controllers  
							
							... 
							
							
							
							This makes views depend on each other at runtime instead of compile-time 
							
						 
						
							2021-05-29 12:15:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3aae5231b2 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for AdminAPI.UserController  
							
							
							
						 
						
							2021-03-02 20:49:17 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2ab9499258 
								
							 
						 
						
							
							
								
								OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions  
							
							... 
							
							
							
							Transforming scopes is no longer necessary since we are dropping
support for accessing admin api without `admin:` prefix in scopes. 
							
						 
						
							2021-02-17 21:37:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								7b67bf4e97 
								
							 
						 
						
							
							
								
								Merge branch 'fix/configdb-error' into 'develop'  
							
							... 
							
							
							
							Improve error message for ConfigDB
See merge request pleroma/pleroma!3289  
							
						 
						
							2021-02-04 14:33:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5fcab23aa3 
								
							 
						 
						
							
							
								
								Improve error message for ConfigDB  
							
							
							
						 
						
							2021-01-28 14:59:23 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4158e8bf0 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the instance adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6806c03e85 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the user statuses adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								44a86951a3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/approval_pending_user_field  
							
							
							
						 
						
							2021-01-18 12:05:05 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d36182c088 
								
							 
						 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed  
							
							
							
						 
						
							2021-01-15 12:44:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ebd7d1365b 
								
							 
						 
						
							
							
								
								Make setting user activation status explicit  
							
							
							
						 
						
							2021-01-15 11:37:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							
							
						 
						
							2021-01-15 11:24:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e59c28ed 
								
							 
						 
						
							
							
								
								Change user.approval_pending field to user.is_approved  
							
							
							
						 
						
							2021-01-15 10:42:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f 
								
							 
						 
						
							
							
								
								Bump Copyright to 2021  
							
							... 
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;' 
							
						 
						
							2021-01-13 07:49:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20af025c65 
								
							 
						 
						
							
							
								
								AdminAPI: return user email  
							
							
							
						 
						
							2021-01-06 11:30:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								20a269ed69 
								
							 
						 
						
							
							
								
								Merge branch 'fix/pagination-regression' into 'develop'  
							
							... 
							
							
							
							Do not try to guess which pagination we need by the existence of an :offset param.
Closes  #2399 
See merge request pleroma/pleroma!3230  
							
						 
						
							2021-01-05 12:40:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								83f27282ba 
								
							 
						 
						
							
							
								
								Do not try to guess which pagination we need by the existence of an :offset param.  
							
							... 
							
							
							
							Require explicit request to get offset pagination. 
							
						 
						
							2021-01-04 10:13:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ec7e9b8e9 
								
							 
						 
						
							
							
								
								AdminAPI: return id for moderation log entries  
							
							
							
						 
						
							2021-01-01 11:59:48 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								afe9c152ab 
								
							 
						 
						
							
							
								
								Merge branch 'fix/reports-ordering' into 'develop'  
							
							... 
							
							
							
							Do not reverse order of reports. We want newest ones sorted to the top.
Closes  #2364 
See merge request pleroma/pleroma!3225  
							
						 
						
							2020-12-31 19:24:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								085d4e6cfc 
								
							 
						 
						
							
							
								
								Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset  
							
							
							
						 
						
							2020-12-30 16:10:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5f75f4e9 
								
							 
						 
						
							
							
								
								Support pagination in AdminAPI for user statuses  
							
							
							
						 
						
							2020-12-30 15:18:54 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								744b34709d 
								
							 
						 
						
							
							
								
								Do not reverse order of reports. We want newest ones sorted to the top.  
							
							
							
						 
						
							2020-12-30 14:22:48 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e4f1d8f48c 
								
							 
						 
						
							
							
								
								Merge branch 'cachex-test' into 'develop'  
							
							... 
							
							
							
							Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209  
							
						 
						
							2020-12-26 10:26:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								95a9bdfc37 
								
							 
						 
						
							
							
								
								Tests: Use NullCache for async tests.  
							
							... 
							
							
							
							Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test. 
							
						 
						
							2020-12-18 19:53:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								713612c377 
								
							 
						 
						
							
							
								
								Cachex: Make caching provider switchable at runtime.  
							
							... 
							
							
							
							Defaults to Cachex. 
							
						 
						
							2020-12-18 17:44:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80891e83d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-12-17 09:05:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								30ed7b502f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-11-21 10:23:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								66f411fba0 
								
							 
						 
						
							
							
								
								added subject actor to moderation log  
							
							
							
						 
						
							2020-11-19 22:13:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bb9650f3c2 
								
							 
						 
						
							
							
								
								FrontendController: Return error on installation error.  
							
							
							
						 
						
							2020-11-17 16:43:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9546c1444c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-11-14 19:48:47 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								435bf1f945 
								
							 
						 
						
							
							
								
								Remove FrontendInstallerWorker  
							
							
							
						 
						
							2020-11-11 20:12:35 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e46c95b826 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api  
							
							
							
						 
						
							2020-11-04 13:23:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7efc074ead 
								
							 
						 
						
							
							
								
								Permit fetching individual reports with notes preloaded  
							
							
							
						 
						
							2020-11-02 13:06:59 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								6163fbf553 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'frontend-admin-api'  
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/router.ex 
							
						 
						
							2020-11-02 10:43:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2113428c0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into feature/account-export  
							
							
							
						 
						
							2020-10-30 19:34:02 +04:00