sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								ef9dea66b2 
								
							 
						 
						
							
							
								
								fix bug in inbound  
							
							
							
						 
						
							2021-12-12 20:12:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								e835212a7d 
								
							 
						 
						
							
							
								
								enforce visibility  
							
							
							
						 
						
							2021-12-12 20:12:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								144c06487a 
								
							 
						 
						
							
							
								
								fix buggos  
							
							
							
						 
						
							2021-12-12 20:01:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ee1a2fc451 
								
							 
						 
						
							
							
								
								fully reference es  
							
							
							
						 
						
							2021-12-12 19:40:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								67f8bdce4f 
								
							 
						 
						
							
							
								
								fix multi-after-transaction  
							
							
							
						 
						
							2021-12-12 19:40:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								7502da993b 
								
							 
						 
						
							
							
								
								pipeline it  
							
							
							
						 
						
							2021-12-12 19:39:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								f341e68622 
								
							 
						 
						
							
							
								
								fix bug in inbound  
							
							
							
						 
						
							2021-12-12 19:31:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								23c758bbe7 
								
							 
						 
						
							
							
								
								enforce visibility  
							
							
							
						 
						
							2021-12-12 18:25:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								0fbf7faf85 
								
							 
						 
						
							
							
								
								Remove IO inspect  
							
							
							
						 
						
							2021-12-12 17:35:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								de60b1f3c1 
								
							 
						 
						
							
							
								
								make search provider configurable  
							
							
							
						 
						
							2021-12-12 17:35:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								fce13cce46 
								
							 
						 
						
							
							
								
								add extra filters  
							
							
							
						 
						
							2021-12-12 17:35:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								449d8ff165 
								
							 
						 
						
							
							
								
								integrate search endpoint with ES  
							
							
							
						 
						
							2021-12-12 17:35:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								9002e5155b 
								
							 
						 
						
							
							
								
								Add import functionality  
							
							
							
						 
						
							2021-12-12 17:35:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								da83839dc1 
								
							 
						 
						
							
							
								
								AttachmentValidator: ingest width and height  
							
							
							
						 
						
							2021-12-12 17:35:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								eb7bbe3fc8 
								
							 
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							2021-12-12 17:35:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Finn Behrens 
								
							 
						 
						
							
							
							
							
								
							
							
								66b60f1ee2 
								
							 
						 
						
							
							
								
								move result into with guard  
							
							
							
						 
						
							2021-12-12 17:35:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								0fab887eee 
								
							 
						 
						
							
							
								
								make linter happy  
							
							
							
						 
						
							2021-12-12 17:35:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								47833e31ad 
								
							 
						 
						
							
							
								
								Remove IO inspect  
							
							
							
						 
						
							2021-12-12 17:26:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ed3a866f94 
								
							 
						 
						
							
							
								
								make search provider configurable  
							
							
							
						 
						
							2021-12-12 17:23:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								dff435488d 
								
							 
						 
						
							
							
								
								Add link headers in ChatController.index2  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-12 17:43:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								345eb7b3f8 
								
							 
						 
						
							
							
								
								add extra filters  
							
							
							
						 
						
							2021-12-11 19:56:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								3478492945 
								
							 
						 
						
							
							
								
								integrate search endpoint with ES  
							
							
							
						 
						
							2021-12-11 18:48:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								c684265585 
								
							 
						 
						
							
							
								
								Add import functionality  
							
							
							
						 
						
							2021-12-11 17:36:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c96668a2c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions  
							
							
							
						 
						
							2021-12-07 13:41:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f03d71ea6 
								
							 
						 
						
							
							
								
								AttachmentValidator: ingest width and height  
							
							
							
						 
						
							2021-12-07 12:59:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								ca8c676867 
								
							 
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							2021-12-07 12:12:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Finn Behrens 
								
							 
						 
						
							
							
							
							
								
							
							
								8af53101fb 
								
							 
						 
						
							
							
								
								move result into with guard  
							
							
							
						 
						
							2021-12-07 09:18:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								c96e52b88c 
								
							 
						 
						
							
							
								
								Add 'notifying' to relationship for compatibility with Mastodon  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 21:24:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								64a4c147b1 
								
							 
						 
						
							
							
								
								MastoAPI: accept notify param in follow request  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 19:36:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								6a6260f64e 
								
							 
						 
						
							
							
								
								re-enable deactivated check  
							
							
							
						 
						
							2021-12-06 12:03:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								db46913dcc 
								
							 
						 
						
							
							
								
								make linter happy  
							
							
							
						 
						
							2021-12-06 11:50:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								cd8bdbc761 
								
							 
						 
						
							
							
								
								Make deactivated user check into a subquery  
							
							... 
							
							
							
							Fixes  #2792  
						
							2021-12-06 11:44:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								ca2bd8b72b 
								
							 
						 
						
							
							
								
								remove deactivated_users call  
							
							
							
						 
						
							2021-12-06 10:18:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								949a53e327 
								
							 
						 
						
							
							
								
								Log Ecto queries > 500ms  
							
							
							
						 
						
							2021-12-05 18:29:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								bb54720778 
								
							 
						 
						
							
							
								
								add debug  
							
							
							
						 
						
							2021-12-05 21:56:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								c85b278f1e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-12-05 15:01:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8286ceb465 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into password-reset  
							
							
							
						 
						
							2021-12-03 00:11:38 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5da4f33bf1 
								
							 
						 
						
							
							
								
								Restore POST /auth/password  
							
							
							
						 
						
							2021-12-03 00:10:57 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								cd5fb84b76 
								
							 
						 
						
							
							
								
								remote_interaction API endpoint  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-02 16:08:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6519f59d91 
								
							 
						 
						
							
							
								
								v2 Suggestions: return is_suggested through the API  
							
							
							
						 
						
							2021-11-26 23:10:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8dc1d2201a 
								
							 
						 
						
							
							
								
								Instance: add v2_suggestions feature  
							
							
							
						 
						
							2021-11-26 22:45:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5a7547fbe 
								
							 
						 
						
							
							
								
								v2 Suggestions: also filter out users you follow  
							
							
							
						 
						
							2021-11-26 21:46:08 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								437c1a5a52 
								
							 
						 
						
							
							
								
								v2 Suggestions: actually flter out dismissed suggestions  
							
							
							
						 
						
							2021-11-26 21:09:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aee55b9a8b 
								
							 
						 
						
							
							
								
								v2 Suggestions: dismiss a suggestion  
							
							
							
						 
						
							2021-11-26 20:19:29 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c0484d571 
								
							 
						 
						
							
							
								
								AdminAPI: suggest a user through the API  
							
							
							
						 
						
							2021-11-26 15:19:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e28d990ecb 
								
							 
						 
						
							
							
								
								v2 Suggestions: don't skip visibility check  
							
							
							
						 
						
							2021-11-26 14:46:29 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b17360cd7c 
								
							 
						 
						
							
							
								
								v2 Suggestions: rudimentary API response  
							
							
							
						 
						
							2021-11-26 14:34:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e1caddc58 
								
							 
						 
						
							
							
								
								v2 Suggestions: return empty array  
							
							
							
						 
						
							2021-11-25 14:57:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								720198d569 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into manifest  
							
							
							
						 
						
							2021-11-24 17:58:58 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb9359335f 
								
							 
						 
						
							
							
								
								Expose /manifest.json for PWA  
							
							
							
						 
						
							2021-11-24 17:50:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								d64d1b1d45 
								
							 
						 
						
							
							
								
								Fix replies count for remote replies  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-23 11:31:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								588bcbac55 
								
							 
						 
						
							
							
								
								Apply 2 suggestion(s) to 2 file(s)  
							
							
							
						 
						
							2021-11-22 10:54:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								8e040e098b 
								
							 
						 
						
							
							
								
								Lint  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 18:17:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								106b5c2678 
								
							 
						 
						
							
							
								
								Fix a typo  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 17:36:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								40414bf177 
								
							 
						 
						
							
							
								
								MastoAPI: Add user notes on accounts  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 16:56:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								a61207cf8f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-11-19 13:43:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								04aca335aa 
								
							 
						 
						
							
							
								
								nodeinfo: report activeMonth and activeHalfyear users fields  
							
							
							
						 
						
							2021-11-15 17:01:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e2772d6bf1 
								
							 
						 
						
							
							
								
								Merge branch 'block-behavior' into 'develop'  
							
							... 
							
							
							
							Configurable block visibility, fixes  #2123 
Closes  #2123 
See merge request pleroma/pleroma!3242  
							
						 
						
							2021-11-15 14:27:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6aff3d3204 
								
							 
						 
						
							
							
								
								Merge branch 'fix-object-deletion-timeout' into 'develop'  
							
							... 
							
							
							
							Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
Closes  #2704 
See merge request pleroma/pleroma!3479  
							
						 
						
							2021-11-15 13:21:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bd77243981 
								
							 
						 
						
							
							
								
								Merge branch 'userfeed-fe-fallback' into 'develop'  
							
							... 
							
							
							
							UserController: fall back to frontend when user isn't found
Closes  #2730 
See merge request pleroma/pleroma!3515  
							
						 
						
							2021-11-15 10:48:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								23e91ec8dd 
								
							 
						 
						
							
							
								
								activity_pub_controller: Fix misleading debug warning in post_inbox_fallback  
							
							
							
						 
						
							2021-11-10 01:11:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								eb1c7d75f4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-10-16 14:08:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6b5c2d5f86 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/group_validator_fields' into 'develop'  
							
							... 
							
							
							
							object_validators: Group common fields in CommonValidations
See merge request pleroma/pleroma!3384  
							
						 
						
							2021-10-10 08:57:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								23161526d4 
								
							 
						 
						
							
							
								
								object_validators: Group common fields in CommonValidations  
							
							... 
							
							
							
							Notes:
- QuestionValidator didn't have a :name field but that seems like a mistake
- `_fields` functions can't inherit others because of some Validators
- bto/bcc fields were absent in activities, also seems like a mistake
  (Well IIRC we don't or barely support bto/bcc anyway) 
							
						 
						
							2021-10-10 02:50:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3af7db9fd7 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2021-10-06 10:49:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a17910a6c6 
								
							 
						 
						
							
							
								
								CI: Bump lint stage to elixir-1.12  
							
							... 
							
							
							
							Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format` 
							
						 
						
							2021-10-06 08:11:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								92a8ff59aa 
								
							 
						 
						
							
							
								
								Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'  
							
							... 
							
							
							
							Allow users to remove their emails if instance does not need email to register
See merge request pleroma/pleroma!3522  
							
						 
						
							2021-10-06 05:44:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								bd9c9136f9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-09-13 16:14:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								555d7d57c9 
								
							 
						 
						
							
							
								
								Add "exposable_reactions" to features, if showing reactions  
							
							
							
						 
						
							2021-09-09 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6b3842cf50 
								
							 
						 
						
							
							
								
								Merge branch 'remove/mastofe' into 'develop'  
							
							... 
							
							
							
							Remove MastoFE from Pleroma, fixes  #2625 
Closes  #2625 
See merge request pleroma/pleroma!3392  
							
						 
						
							2021-09-07 16:41:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								c31e491e99 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-09-07 10:00:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								198250dcef 
								
							 
						 
						
							
							
								
								Allow users to remove their emails if instance does not need email to register  
							
							
							
						 
						
							2021-09-05 21:27:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								181282fb2e 
								
							 
						 
						
							
							
								
								Remove unused Logger  
							
							
							
						 
						
							2021-09-01 14:56:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								b202cf15d6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-08-30 22:04:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3117c60997 
								
							 
						 
						
							
							
								
								Make suggested change for create_response  
							
							
							
						 
						
							2021-08-29 07:25:54 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e59cdd80f 
								
							 
						 
						
							
							
								
								Fix aliases sorting  
							
							
							
						 
						
							2021-08-29 07:22:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33f063204e 
								
							 
						 
						
							
							
								
								Add unit test for Pleroma API app controller  
							
							
							
						 
						
							2021-08-28 23:18:12 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d02cf7b0cd 
								
							 
						 
						
							
							
								
								Fix lint  
							
							
							
						 
						
							2021-08-28 18:17:09 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a14e1c0003 
								
							 
						 
						
							
							
								
								Move GET /api/v1/apps to GET /api/v1/pleroma/apps  
							
							
							
						 
						
							2021-08-28 18:02:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eab6291094 
								
							 
						 
						
							
							
								
								Require follow and read OAuth scopes for GET /api/v1/apps  
							
							
							
						 
						
							2021-08-28 11:13:25 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20084329ea 
								
							 
						 
						
							
							
								
								Selecting MRF policies didn't work as intended any more  
							
							... 
							
							
							
							* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
    * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
    * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509  
							
						 
						
							2021-08-28 18:27:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd0eb1c675 
								
							 
						 
						
							
							
								
								Make activity search properly use GIN indexes  
							
							... 
							
							
							
							The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.
[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html 
To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.
[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3519 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2758  
							
						 
						
							2021-08-28 18:26:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								53b0dd4ecc 
								
							 
						 
						
							
							
								
								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
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510  
							
						 
						
							2021-08-28 18:23:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sam Therapy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								09c42ce13e 
								
							 
						 
						
							
							
								
								Add Admin-FE menu for StealEmojiPolicy  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512  
							
						 
						
							2021-08-28 18:21:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								bc62a35282 
								
							 
						 
						
							
							
								
								Merge branch 'features/ingestion-no-nil' into 'develop'  
							
							... 
							
							
							
							ObjectValidator.stringify_keys: filter out nil values
See merge request pleroma/pleroma!3506  
							
						 
						
							2021-08-28 16:07:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6633ec816f 
								
							 
						 
						
							
							
								
								Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'  
							
							... 
							
							
							
							Selecting MRF policies didn't work as intended any more
Closes admin-fe#198
See merge request pleroma/pleroma!3509  
							
						 
						
							2021-08-28 16:06:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a9984c6da7 
								
							 
						 
						
							
							
								
								Make activity search properly use GIN indexes  
							
							... 
							
							
							
							The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.
[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html 
To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.
[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502 
BUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2758  
							
						 
						
							2021-08-27 22:27:17 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								baa8196fc9 
								
							 
						 
						
							
							
								
								Fix API spec, add app schema  
							
							
							
						 
						
							2021-08-26 11:55:43 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba6914f90a 
								
							 
						 
						
							
							
								
								Fix formatting in app_operation.ex  
							
							
							
						 
						
							2021-08-26 11:11:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6519732045 
								
							 
						 
						
							
							
								
								GET /api/v1/apps endpoint  
							
							
							
						 
						
							2021-08-25 21:01:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b11dbbf403 
								
							 
						 
						
							
							
								
								UserController: fall back to frontend when user isn't found  
							
							
							
						 
						
							2021-08-17 18:32:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								84ec0fbeaa 
								
							 
						 
						
							
							
								
								Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop'  
							
							... 
							
							
							
							List available frontends also when no static/frontends folder is present yet
Closes admin-fe#201
See merge request pleroma/pleroma!3510  
							
						 
						
							2021-08-14 18:42:12 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								2d9f803dc6 
								
							 
						 
						
							
							
								
								Merge branch 'StealEmojiMRF_add_adminFE' into 'develop'  
							
							... 
							
							
							
							Add Admin-FE menu for StealEmojiPolicy
See merge request pleroma/pleroma!3512  
							
						 
						
							2021-08-14 18:40:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								773708cfe8 
								
							 
						 
						
							
							
								
								Merge branch 'builder-note' into 'develop'  
							
							... 
							
							
							
							CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
See merge request pleroma/pleroma!3511  
							
						 
						
							2021-08-14 18:32:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba6049aa81 
								
							 
						 
						
							
							
								
								Builder.note/1: return {:ok, map(), keyword()} like other Builder functions  
							
							
							
						 
						
							2021-08-14 11:24:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sam Therapy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b901b73057 
								
							 
						 
						
							
							
								
								Add Admin-FE menu for StealEmojiPolicy  
							
							
							
						 
						
							2021-08-14 11:08:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a2eacfc525 
								
							 
						 
						
							
							
								
								CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1  
							
							
							
						 
						
							2021-08-14 11:01:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								5049b4272e 
								
							 
						 
						
							
							
								
								Selecting MRF policies didn't work as intended any more  
							
							... 
							
							
							
							* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
    * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
    * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not. 
							
						 
						
							2021-08-14 13:42:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01175ef498 
								
							 
						 
						
							
							
								
								Streamer: fix crash in MastodonAPI.StatusView  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508  
							
						 
						
							2021-08-13 17:58:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27e1e4c742 
								
							 
						 
						
							
							
								
								Activity.Search: fallback on status resolution on DB Timeout  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3507  
							
						 
						
							2021-08-13 17:57:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e117551169 
								
							 
						 
						
							
							
								
								AdminAPI: hotfix for nil report objects  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504  
							
						 
						
							2021-08-13 17:57:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb2d5879cc 
								
							 
						 
						
							
							
								
								maybe_notify_subscribers: Don't create notifications from ingested replies  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505  
							
						 
						
							2021-08-13 17:57:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e2aebd036 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_email require body params instead of query  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503  
							
						 
						
							2021-08-13 17:57:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3961422f85 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_password require body params instead of query  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503  
							
						 
						
							2021-08-13 17:56:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8baaa36a16 
								
							 
						 
						
							
							
								
								ObjectAgePolicy: Fix pattern matching on published  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500  
							
						 
						
							2021-08-13 17:56:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								34606d609d 
								
							 
						 
						
							
							
								
								fix: stream out Create Activity  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499  
							
						 
						
							2021-08-13 17:54:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								61ba54897e 
								
							 
						 
						
							
							
								
								Merge branch 'streamer-crash-fix' into 'develop'  
							
							... 
							
							
							
							Streamer crash fix
See merge request pleroma/pleroma!3508  
							
						 
						
							2021-08-13 15:42:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b7bbf42acd 
								
							 
						 
						
							
							
								
								Streamer: fix crash in MastodonAPI.StatusView  
							
							
							
						 
						
							2021-08-13 10:25:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7afabe1cc6 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/status-search-fallback' into 'develop'  
							
							... 
							
							
							
							Activity.Search: resolve status on DB Timeout
Closes  #2566 
See merge request pleroma/pleroma!3507  
							
						 
						
							2021-08-13 12:09:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6455b967ec 
								
							 
						 
						
							
							
								
								Activity.Search: fallback on status resolution on DB Timeout  
							
							
							
						 
						
							2021-08-12 10:35:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3a7b54be4a 
								
							 
						 
						
							
							
								
								Merge branch 'nil-report-object-hotfix' into 'develop'  
							
							... 
							
							
							
							AdminAPI: hotfix for nil report objects
See merge request pleroma/pleroma!3504  
							
						 
						
							2021-08-11 20:30:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61d233921c 
								
							 
						 
						
							
							
								
								ObjectValidator.stringify_keys: filter out nil values  
							
							
							
						 
						
							2021-08-11 21:38:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3ca39ccf69 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/subscriptions-replies' into 'develop'  
							
							... 
							
							
							
							maybe_notify_subscribers: Normalize Object to check inReplyTo presence
Closes  #2732 
See merge request pleroma/pleroma!3505  
							
						 
						
							2021-08-11 18:50:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								436fac3bac 
								
							 
						 
						
							
							
								
								maybe_notify_subscribers: Don't create notifications from ingested messages  
							
							
							
						 
						
							2021-08-11 20:49:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7247c29653 
								
							 
						 
						
							
							
								
								AdminAPI: hotfix for nil report objects  
							
							
							
						 
						
							2021-08-11 09:42:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								7c1243178b 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/change_password' into 'develop'  
							
							... 
							
							
							
							TwitterAPI: Make change_password require body params instead of query
Closes  #2740 
See merge request pleroma/pleroma!3503  
							
						 
						
							2021-08-10 18:40:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								197cdebca9 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_email require body params instead of query  
							
							
							
						 
						
							2021-08-10 20:33:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								8679a57a71 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/object-age-create' into 'develop'  
							
							... 
							
							
							
							ObjectAgePolicy: Fix pattern matching on published
See merge request pleroma/pleroma!3500  
							
						 
						
							2021-08-10 18:16:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								09dcb2b522 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_password require body params instead of query  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740  
							
						 
						
							2021-08-10 20:01:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c64eae40a2 
								
							 
						 
						
							
							
								
								ObjectAgePolicy: Fix pattern matching on published  
							
							
							
						 
						
							2021-08-10 07:41:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								f4af74b0fc 
								
							 
						 
						
							
							
								
								Merge branch 'fix/streaming-api-for-create-activity' into 'develop'  
							
							... 
							
							
							
							fix: stream out Create Activity
Closes  #2691 
See merge request pleroma/pleroma!3499  
							
						 
						
							2021-08-09 19:10:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								901204df22 
								
							 
						 
						
							
							
								
								Merge branch 'poll-notification' into 'develop'  
							
							... 
							
							
							
							MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484  
							
						 
						
							2021-08-09 10:02:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee5def34da 
								
							 
						 
						
							
							
								
								fix: stream out Create Activity  
							
							
							
						 
						
							2021-08-09 18:37:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
							
							
								
							
							
								1841bd8383 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe  
							
							
							
						 
						
							2021-08-06 08:08:20 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad09bdb376 
								
							 
						 
						
							
							
								
								Improve readability  
							
							
							
						 
						
							2021-08-06 07:59:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b0926a71b2 
								
							 
						 
						
							
							
								
								Make transparency_exclusions use tuples in admin-fe  
							
							... 
							
							
							
							* Make it use tuples
* I also changed the keys for key_placeholder and value_placeholder to use snake_case instead of camelCase 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4028c908c 
								
							 
						 
						
							
							
								
								Add key- and valuePlaceholders for quarantined_instances and mrf_simple  
							
							... 
							
							
							
							* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility) 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03030b47c2 
								
							 
						 
						
							
							
								
								quarantine instances info  
							
							... 
							
							
							
							Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}` 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								47fc57bbcc 
								
							 
						 
						
							
							
								
								Change what nodeinfo returns without breaking backwards compatibility  
							
							... 
							
							
							
							* Only for SimplePolicy for now
* I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fdc3cde06 
								
							 
						 
						
							
							
								
								Return maps in node_info  
							
							... 
							
							
							
							It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances. 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c0489f9fac 
								
							 
						 
						
							
							
								
								Fixed deprecation warning checks  
							
							... 
							
							
							
							When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one. 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c5a497b19 
								
							 
						 
						
							
							
								
								Deprecate transparency_exclusions  
							
							... 
							
							
							
							* Give deprecation message
* Rewrite configs 
							
						 
						
							2021-08-06 07:59:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dfeb3862da 
								
							 
						 
						
							
							
								
								config :mrf, :transparency_exclusions works with tumples now  
							
							
							
						 
						
							2021-08-06 07:59:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0c7d77197 
								
							 
						 
						
							
							
								
								Deprecate and rewrite settings for quarentine settings  
							
							... 
							
							
							
							* This is for the settings, not yet a DB migration 
							
						 
						
							2021-08-06 07:59:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27fe7b0274 
								
							 
						 
						
							
							
								
								Make quarentine work with list of tuples instead of strings  
							
							
							
						 
						
							2021-08-06 07:59:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ba0beb60c 
								
							 
						 
						
							
							
								
								Make mrfSimple work with tuples  
							
							... 
							
							
							
							* Changed SimplePolicy
* I also grepped in test/ for ':mrf_simple' to see what other things could be affected 
							
						 
						
							2021-08-06 07:58:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								647087d7fd 
								
							 
						 
						
							
							
								
								Deprectate strings for SimplePolicy  
							
							... 
							
							
							
							When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead 
							
						 
						
							2021-08-06 05:01:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b83758bd96 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into moderators  
							
							
							
						 
						
							2021-08-05 11:11:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								daab1eaa65 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-08-05 13:01:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								44ede0657f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into staff-plug  
							
							
							
						 
						
							2021-08-04 11:48:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								2519d4eb1a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-08-02 22:10:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f23dd6cc8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility  
							
							
							
						 
						
							2021-07-27 08:54:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9cc8642b80 
								
							 
						 
						
							
							
								
								Visibility: check Tombstone objects in visible_for_user?/2  
							
							
							
						 
						
							2021-07-27 08:54:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								de69585eaa 
								
							 
						 
						
							
							
								
								:Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into develop  
							
							
							
						 
						
							2021-07-23 09:57:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								7acdab1f30 
								
							 
						 
						
							
							
								
								Merge branch 'mkljczk-develop-patch-60115' into 'develop'  
							
							... 
							
							
							
							MastodonAPI: Fix list timelines
Closes mastofe#89 and #2693 
See merge request pleroma/pleroma!3477  
							
						 
						
							2021-07-22 18:41:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62bf6d67e3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes  
							
							
							
						 
						
							2021-07-18 11:49:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								70f1496eb8 
								
							 
						 
						
							
							
								
								Poll notification: only notify local users  
							
							
							
						 
						
							2021-07-18 11:10:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0b1c05ca1e 
								
							 
						 
						
							
							
								
								Poll notification: trigger PollWorker through common_pipeline  
							
							
							
						 
						
							2021-07-18 11:10:23 -05:00