FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								3928cecf6b 
								
							 
						 
						
							
							
								
								ensure local statuses are not visible remotely  
							
							
							
						 
						
							2022-06-22 17:06:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								502382da45 
								
							 
						 
						
							
							
								
								cherry-pick security from upstream  
							
							
							
						 
						
							2022-06-22 16:25:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								6e1d9c63da 
								
							 
						 
						
							
							
								
								allow %{source} dict in no_empty  
							
							
							
						 
						
							2022-06-14 17:41:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								abefbcec64 
								
							 
						 
						
							
							
								
								Merge branch 'mfm' into develop  
							
							
							
						 
						
							2022-06-14 16:25:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								829ae13572 
								
							 
						 
						
							
							
								
								ensure tests pass  
							
							
							
						 
						
							2022-06-14 16:24:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								3f06ccc9e3 
								
							 
						 
						
							
							
								
								allow source from misskey  
							
							
							
						 
						
							2022-06-14 10:56:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sn0w 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								60bfaed368 
								
							 
						 
						
							
							
								
								Allow reacting with emojis containing a number  
							
							
							
						 
						
							2022-06-14 11:47:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								24bf8c3977 
								
							 
						 
						
							
							
								
								mix format  
							
							
							
						 
						
							2022-06-11 16:14:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								32fbd2e4e3 
								
							 
						 
						
							
							
								
								fix all tests  
							
							
							
						 
						
							2022-06-11 16:14:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								c3ed86cd1e 
								
							 
						 
						
							
							
								
								fix emoji controller tests  
							
							
							
						 
						
							2022-06-11 14:21:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								142646426e 
								
							 
						 
						
							
							
								
								fix emoji tests  
							
							
							
						 
						
							2022-06-11 14:08:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								71f4281850 
								
							 
						 
						
							
							
								
								fix quoting of custom emoji  
							
							... 
							
							
							
							Fixes  #3  
						
							2022-06-11 14:08:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ed58a6b070 
								
							 
						 
						
							
							
								
								run mix format  
							
							
							
						 
						
							2022-06-10 13:41:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								e910f21d8d 
								
							 
						 
						
							
							
								
								allow undoing  
							
							
							
						 
						
							2022-06-08 13:27:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								e724da2a42 
								
							 
						 
						
							
							
								
								remove io.inspects  
							
							
							
						 
						
							2022-06-08 12:58:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								c5467d04e4 
								
							 
						 
						
							
							
								
								add outbound reacts  
							
							
							
						 
						
							2022-06-08 12:36:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								ad0b8c095c 
								
							 
						 
						
							
							
								
								add custom emoji reaction support  
							
							
							
						 
						
							2022-06-08 02:42:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								8cc6359a85 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop  
							
							
							
						 
						
							2022-01-07 20:23:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								25b4395830 
								
							 
						 
						
							
							
								
								just drop unknown tags  
							
							
							
						 
						
							2022-01-07 20:14:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								34780cf182 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop  
							
							
							
						 
						
							2022-01-07 17:36:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc6b1e1bd 
								
							 
						 
						
							
							
								
								Allow for varying name fields  
							
							
							
						 
						
							2022-01-07 17:35:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								5c48fe1138 
								
							 
						 
						
							
							
								
								make credo happy  
							
							
							
						 
						
							2022-01-07 17:31:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								92d3742072 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop  
							
							
							
						 
						
							2022-01-07 17:21:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								9ee27fb5ec 
								
							 
						 
						
							
							
								
								add bookwyrm entity tests  
							
							
							
						 
						
							2022-01-07 17:17:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								680c5d8d89 
								
							 
						 
						
							
							
								
								Add compatibility with bookwyrm's weird entities  
							
							
							
						 
						
							2022-01-07 16:51:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								3252ed0f54 
								
							 
						 
						
							
							
								
								format  
							
							
							
						 
						
							2021-12-30 18:05:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								4e8ee48cff 
								
							 
						 
						
							
							
								
								delete activities  
							
							
							
						 
						
							2021-12-30 18:05:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								12a171844b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							
							
						 
						
							2021-12-30 18:05:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								de006443f0 
								
							 
						 
						
							
							
								
								MastoAPI: Profile directory  
							
							
							
						 
						
							2021-12-26 02:35:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								d9746ae4cb 
								
							 
						 
						
							
							
								
								Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'  
							
							... 
							
							
							
							Handle Reject for already-accepted Follows properly
Closes  #2766  and #2802 
See merge request pleroma/pleroma!3568  
							
						 
						
							2021-12-23 16:00:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								df5359aa72 
								
							 
						 
						
							
							
								
								Merge branch 'replies-count' into 'develop'  
							
							... 
							
							
							
							Fix replies count for remote replies
See merge request pleroma/pleroma!3541  
							
						 
						
							2021-12-19 17:36:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d41ccc47b 
								
							 
						 
						
							
							
								
								Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2  
							
							... 
							
							
							
							Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case. 
							
						 
						
							2021-12-17 14:17:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								703f53c08f 
								
							 
						 
						
							
							
								
								Search through users and hashtags as well  
							
							
							
						 
						
							2021-12-14 13:55:14 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								6a6260f64e 
								
							 
						 
						
							
							
								
								re-enable deactivated check  
							
							
							
						 
						
							2021-12-06 12:03:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								ca2bd8b72b 
								
							 
						 
						
							
							
								
								remove deactivated_users call  
							
							
							
						 
						
							2021-12-06 10:18:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								bb54720778 
								
							 
						 
						
							
							
								
								add debug  
							
							
							
						 
						
							2021-12-05 21:56:11 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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