rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2698bbc9f6 
								
							 
						 
						
							
							
								
								Merge branch 'filtering-following' into 'develop'  
							
							... 
							
							
							
							ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022  
							
						 
						
							2020-10-06 18:11:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								de993b856b 
								
							 
						 
						
							
							
								
								added force option to the unfollow operation  
							
							
							
						 
						
							2020-09-28 09:16:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								93b674b66d 
								
							 
						 
						
							
							
								
								Fix test failures for NoOpPolicy describe/0  
							
							
							
						 
						
							2020-09-25 12:46:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e86a2809e 
								
							 
						 
						
							
							
								
								transmogrifier: Drop incoming create early if it already exists  
							
							
							
						 
						
							2020-09-23 13:40:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee3052a2d8 
								
							 
						 
						
							
							
								
								ActivityPub: Return Announces when filtering by following.  
							
							
							
						 
						
							2020-09-22 14:20:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a428800405 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-09-17 22:22:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								abf25e5d52 
								
							 
						 
						
							
							
								
								Create MRF.filter_pipeline to inject :object_data when present  
							
							
							
						 
						
							2020-09-17 22:07:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d9fb5bc08a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream  
							
							
							
						 
						
							2020-09-17 17:14:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								adbd0032fa 
								
							 
						 
						
							
							
								
								Merge branch 'features/validators-video' into 'develop'  
							
							... 
							
							
							
							Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908  
							
						 
						
							2020-09-16 13:36:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2f155fb89f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream  
							
							
							
						 
						
							2020-09-15 20:29:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								3ab59a6f3c 
								
							 
						 
						
							
							
								
								Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user  
							
							
							
						 
						
							2020-09-15 13:00:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0bda85857e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/instances/instance.ex 
							
						 
						
							2020-09-11 17:19:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b3d5956b1 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Article  
							
							
							
						 
						
							2020-09-11 01:40:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								846b59ccb0 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Video  
							
							
							
						 
						
							2020-09-11 01:39:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								93e1c8df9d 
								
							 
						 
						
							
							
								
								reject activity creation  
							
							... 
							
							
							
							if passed expires_at option and expiring activities are not configured 
							
						 
						
							2020-09-10 21:50:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								9bf1065a06 
								
							 
						 
						
							
							
								
								schedule activity expiration in Oban  
							
							
							
						 
						
							2020-09-10 21:50:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								541a3eede2 
								
							 
						 
						
							
							
								
								Merge branch 'chores/remove-ostatus-fixtures' into 'develop'  
							
							... 
							
							
							
							Remove OStatus in testsuite
See merge request pleroma/pleroma!2968  
							
						 
						
							2020-09-10 18:41:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4ee99dafcc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into media-preview-proxy  
							
							
							
						 
						
							2020-09-09 11:11:36 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								10ef532c63 
								
							 
						 
						
							
							
								
								AP C2S: Restrict character limit on Note  
							
							
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								921f926e96 
								
							 
						 
						
							
							
								
								Remove OStatus in testsuite  
							
							
							
						 
						
							2020-09-08 18:43:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee0e05f930 
								
							 
						 
						
							
							
								
								Drop unused "inReplyToAtomUri" in objects  
							
							
							
						 
						
							2020-09-08 18:43:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								d074e54013 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: try to fix test 2  
							
							
							
						 
						
							2020-09-07 23:28:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								0a25c92cfa 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: try to fix test  
							
							
							
						 
						
							2020-09-07 23:18:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								d2fd1d3481 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: fix test extension  
							
							
							
						 
						
							2020-09-07 23:04:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								8b695c3eeb 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: format  
							
							
							
						 
						
							2020-09-07 22:53:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								57cf0cc3b3 
								
							 
						 
						
							
							
								
								ForceBotUnlistedPolicy: add test  
							
							
							
						 
						
							2020-09-07 22:50:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								759f8bc3ae 
								
							 
						 
						
							
							
								
								[ #2497 ] Fixed MediaProxyWarmingPolicyTest.  
							
							
							
						 
						
							2020-09-06 15:30:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a142da3e4f 
								
							 
						 
						
							
							
								
								Add new Emoji Ecto.Type and fix emoji in Question  
							
							
							
						 
						
							2020-09-01 08:34:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d39abd02ac 
								
							 
						 
						
							
							
								
								Merge branch 'relay-fix-admin-fe' into 'develop'  
							
							... 
							
							
							
							Relay fix for admin-fe
See merge request pleroma/pleroma!2902  
							
						 
						
							2020-08-24 17:03:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36c125a071 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Event  
							
							
							
						 
						
							2020-08-20 21:49:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c1277be041 
								
							 
						 
						
							
							
								
								AudioHandlingTest: Make mock explicit  
							
							
							
						 
						
							2020-08-19 14:36:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dc275b69b 
								
							 
						 
						
							
							
								
								relay fix for admin-fe  
							
							
							
						 
						
							2020-08-19 08:41:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5316e231b0 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Audio (Part 2)  
							
							
							
						 
						
							2020-08-19 00:06:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3d5d8c05c9 
								
							 
						 
						
							
							
								
								Merge branch '2064-image-blanking' into 'develop'  
							
							... 
							
							
							
							Resolve "Make default image description blank"
Closes  #2064 
See merge request pleroma/pleroma!2899  
							
						 
						
							2020-08-18 19:02:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0a8d723bb 
								
							 
						 
						
							
							
								
								Transmogrifier Test: Extract audio tests.  
							
							
							
						 
						
							2020-08-18 13:37:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aabc26a573 
								
							 
						 
						
							
							
								
								Pleroma.Upload: Set default upload name / description based on config.  
							
							
							
						 
						
							2020-08-18 13:21:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								14a06e63f6 
								
							 
						 
						
							
							
								
								Merge branch 'fix/activity-expirations-again' into 'develop'  
							
							... 
							
							
							
							Fix activity expirations again
See merge request pleroma/pleroma!2866  
							
						 
						
							2020-08-13 17:38:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7224bf309e 
								
							 
						 
						
							
							
								
								Transmogrifier: Move Rejects to the Pipeline  
							
							
							
						 
						
							2020-08-12 14:48:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								62f7cca9a1 
								
							 
						 
						
							
							
								
								Transmogrifier Tests: Extract rejections.  
							
							
							
						 
						
							2020-08-12 13:39:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f988d82e46 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle accepts with the pipeline  
							
							
							
						 
						
							2020-08-11 17:26:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9dda13bfa1 
								
							 
						 
						
							
							
								
								Transmogrifier Test: Remove mastodon hack test.  
							
							
							
						 
						
							2020-08-11 16:22:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3f6d50111e 
								
							 
						 
						
							
							
								
								Linter fixes.  
							
							
							
						 
						
							2020-08-11 16:07:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								da3f9b9988 
								
							 
						 
						
							
							
								
								Transmogrifier: Remove handling of orphaned accepts  
							
							... 
							
							
							
							This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older. 
							
						 
						
							2020-08-11 15:41:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b1e8bec2f 
								
							 
						 
						
							
							
								
								AcceptValidation: Codify accept rules.  
							
							
							
						 
						
							2020-08-11 15:32:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f1a0c10b17 
								
							 
						 
						
							
							
								
								AcceptValidator: Add basic validator with tests.  
							
							
							
						 
						
							2020-08-11 15:13:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8f9fbc86c0 
								
							 
						 
						
							
							
								
								Transmogrifier: Small readability changes.  
							
							
							
						 
						
							2020-08-11 14:02:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								54a6855ddf 
								
							 
						 
						
							
							
								
								Transmogrifier Tests: Extract Accept handling  
							
							
							
						 
						
							2020-08-11 14:01:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e4932362b 
								
							 
						 
						
							
							
								
								SideEffects: Handle strange deletion case.  
							
							
							
						 
						
							2020-08-11 10:54:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9c96fc052a 
								
							 
						 
						
							
							
								
								CommonValidations: Extract modification right checker  
							
							
							
						 
						
							2020-08-05 17:26:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								19c108170e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation  
							
							
							
						 
						
							2020-08-05 11:12:14 +02:00