floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								c9600dbbbf 
								
							 
						 
						
							
							
								
								local-only-fixed ( #138 )  
							
							 
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/138  
							
						 
						
							2022-08-02 14:46:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								502382da45 
								
							 
						 
						
							
							
								
								cherry-pick security from upstream  
							
							 
							
							
							
						 
						
							2022-06-22 16:25:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6dc78f5f6f 
								
							 
						 
						
							
							
								
								AP C2S: Remove restrictions and make it go through pipeline  
							
							 
							
							
							
						 
						
							2021-07-12 06:49:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c4b4258374 
								
							 
						 
						
							
							
								
								Merge branch 'features/validators-note' into 'develop'  
							
							 
							
							... 
							
							
							
							Pipeline Ingestion: Note
Closes  #290 
See merge request pleroma/pleroma!2984  
							
						 
						
							2021-06-01 01:51:38 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4694853766 
								
							 
						 
						
							
							
								
								Provide totalItems field for featured collections  
							
							 
							
							
							
						 
						
							2021-05-27 12:17:31 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								53193b84b1 
								
							 
						 
						
							
							
								
								utils: Fix maybe_splice_recipient when "object" isn’t a map  
							
							 
							
							
							
						 
						
							2021-04-05 19:19:12 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1205406d9 
								
							 
						 
						
							
							
								
								ActivityPubControllerTest: Apply same addr changes to object  
							
							 
							
							
							
						 
						
							2021-04-05 19:19:12 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c944932674 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Note  
							
							 
							
							
							
						 
						
							2021-04-05 19:19:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1d2744ee3 
								
							 
						 
						
							
							
								
								featured_address valition in AddRemoveValidator  
							
							 
							
							
							
						 
						
							2021-03-25 13:03:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								17f28c0507 
								
							 
						 
						
							
							
								
								mastodon pins  
							
							 
							
							
							
						 
						
							2021-03-25 13:03:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ec1dbd922 
								
							 
						 
						
							
							
								
								Let pins federate  
							
							 
							
							... 
							
							
							
							- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins 
							
						 
						
							2021-03-25 13:03:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								76414ad277 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/answer-outbox' into 'develop'  
							
							 
							
							... 
							
							
							
							Add test for Answer presence into an authenticated /outbox
See merge request pleroma/pleroma!3269  
							
						 
						
							2021-02-12 08:48:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c7b3b20d8 
								
							 
						 
						
							
							
								
								activity_pub_controller: Add authentication to object & activity endpoints  
							
							 
							
							
							
						 
						
							2021-02-08 20:00:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fb25231fbe 
								
							 
						 
						
							
							
								
								Add test for Answer presence into an authenticated /outbox  
							
							 
							
							
							
						 
						
							2021-02-03 12:07:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9272cef500 
								
							 
						 
						
							
							
								
								Switch to a build of Majic that does not try to fix extensions by default  
							
							 
							
							
							
						 
						
							2021-01-28 14:03:29 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e854c35e65 
								
							 
						 
						
							
							
								
								Convert tests to all use clear_config instead of Pleroma.Config.put  
							
							 
							
							
							
						 
						
							2021-01-26 11:58:43 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f 
								
							 
						 
						
							
							
								
								Bump Copyright to 2021  
							
							 
							
							... 
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;' 
							
						 
						
							2021-01-13 07:49:50 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1e7e4d379 
								
							 
						 
						
							
							
								
								Object: Rework how Object.normalize works  
							
							 
							
							... 
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 
						
							2021-01-04 13:38:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35ba48494f 
								
							 
						 
						
							
							
								
								Stream follow updates  
							
							 
							
							
							
						 
						
							2020-12-02 00:18:58 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3283d0805f 
								
							 
						 
						
							
							
								
								Use Jason instead of Poison in tests  
							
							 
							
							
							
						 
						
							2020-11-23 13:28:55 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46dab37351 
								
							 
						 
						
							
							
								
								little fix  
							
							 
							
							
							
						 
						
							2020-11-19 15:29:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4aaffe3a10 
								
							 
						 
						
							
							
								
								log capture  
							
							 
							
							
							
						 
						
							2020-11-19 09:58:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be0b874e1d 
								
							 
						 
						
							
							
								
								fix for mastodon forwarded reports  
							
							 
							
							
							
						 
						
							2020-11-19 09:53:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a840aefda8 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2020-11-19 09:53:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2bf6b1f7e 
								
							 
						 
						
							
							
								
								fix for forwarded reports  
							
							 
							
							
							
						 
						
							2020-11-19 09:53:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								81293e5aad 
								
							 
						 
						
							
							
								
								ActivityPubController: Don't return local only objects  
							
							 
							
							
							
						 
						
							2020-11-17 13:11:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								049ece1ef3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex 
							
						 
						
							2020-10-17 13:12:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b738f70953 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/gen-magic  
							
							 
							
							
							
						 
						
							2020-10-13 10:08:38 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dffaef479 
								
							 
						 
						
							
							
								
								tests consistency  
							
							 
							
							
							
						 
						
							2020-10-13 16:35:09 +03:00