lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b39eb6ecc5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information  
							
							
							
						 
						
							2020-07-10 12:26:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d23804f191 
								
							 
						 
						
							
							
								
								Use the Pleroma.Config alias  
							
							
							
						 
						
							2020-07-09 10:53:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								68036f5a3b 
								
							 
						 
						
							
							
								
								Merge branch 'follow-pipeline' into 'develop'  
							
							... 
							
							
							
							Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734  
							
						 
						
							2020-07-09 10:32:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00e54f8fe7 
								
							 
						 
						
							
							
								
								ActivityPub: Remove follow and fix issues.  
							
							
							
						 
						
							2020-07-08 17:07:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9dda8b5427 
								
							 
						 
						
							
							
								
								CommonAPI: Switch to pipeline for following.  
							
							
							
						 
						
							2020-07-08 15:40:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								172f4aff8e 
								
							 
						 
						
							
							
								
								Transmogrifier: Move following to the pipeline.  
							
							
							
						 
						
							2020-07-08 14:30:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d0e2b3fdd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline  
							
							
							
						 
						
							2020-07-08 13:23:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cdc153db31 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880  
							
							
							
						 
						
							2020-07-08 13:21:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e341f81785 
								
							 
						 
						
							
							
								
								fixed delete Like activity in remove user  
							
							
							
						 
						
							2020-07-08 09:06:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9ad305209a 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/peertube-videos' into 'develop'  
							
							... 
							
							
							
							Fix getting videos from peertube
See merge request pleroma/pleroma!2728  
							
						 
						
							2020-07-07 09:14:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fbb9743a70 
								
							 
						 
						
							
							
								
								Fix getting videos from peertube  
							
							
							
						 
						
							2020-07-07 09:38:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a6a12b241f 
								
							 
						 
						
							
							
								
								FollowValidator: Add basic validation.  
							
							
							
						 
						
							2020-07-06 15:57:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								208baf157a 
								
							 
						 
						
							
							
								
								ActivityPub: Add new 'capabilities' to user.  
							
							
							
						 
						
							2020-07-06 11:38:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8277b29790 
								
							 
						 
						
							
							
								
								Restrict thread statuses that contain user's irreversible filters  
							
							
							
						 
						
							2020-07-06 09:30:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a8c26654e 
								
							 
						 
						
							
							
								
								Restrict statuses that contain user's irreversible filters  
							
							
							
						 
						
							2020-07-06 09:28:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4a7b89e372 
								
							 
						 
						
							
							
								
								ChatMessageValidator: Additional validation.  
							
							
							
						 
						
							2020-07-03 15:13:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5c0bf4c472 
								
							 
						 
						
							
							
								
								ActivityPub: Ingest information about chat acceptance.  
							
							
							
						 
						
							2020-07-03 13:58:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								26a7cc3f00 
								
							 
						 
						
							
							
								
								UserView: Add acceptsChatMessages field  
							
							
							
						 
						
							2020-07-03 13:38:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c044f6225 
								
							 
						 
						
							
							
								
								Merge branch 'fetcher-fixes' into 'develop'  
							
							... 
							
							
							
							Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711  
							
						 
						
							2020-07-02 10:17:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bad08f34ca 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2020-07-02 09:57:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								61fe94d698 
								
							 
						 
						
							
							
								
								SideEffects: Refactor.  
							
							
							
						 
						
							2020-07-02 09:33:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fedfe8f7d6 
								
							 
						 
						
							
							
								
								ActivityPub: Handle clashing nicknames for the same ap id  
							
							... 
							
							
							
							If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way. 
							
						 
						
							2020-07-01 12:26:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ce92e6e5ce 
								
							 
						 
						
							
							
								
								Fetcher: Work when we can't get the OP.  
							
							
							
						 
						
							2020-07-01 11:48:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								577da132da 
								
							 
						 
						
							
							
								
								Merge branch '1031-parent-visible' into 'develop'  
							
							... 
							
							
							
							Resolve "Add `pleroma.parent_visible` to the status view"
Closes  #1031 
See merge request pleroma/pleroma!2679  
							
						 
						
							2020-06-29 08:39:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								bf1c5e255a 
								
							 
						 
						
							
							
								
								Merge branch 'block-handling' into 'develop'  
							
							... 
							
							
							
							Handle blocks with the pipeline
See merge request pleroma/pleroma!2685  
							
						 
						
							2020-06-26 17:41:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								15a8b70318 
								
							 
						 
						
							
							
								
								User: Don't unfollow on block when the relevant setting is set.  
							
							
							
						 
						
							2020-06-26 12:06:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c3383d4fab 
								
							 
						 
						
							
							
								
								BlockValidator: Restore old behavior for incoming blocks.  
							
							
							
						 
						
							2020-06-26 11:58:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								04abee782b 
								
							 
						 
						
							
							
								
								AntiSpamLinkPolicy: Exempt local users.  
							
							
							
						 
						
							2020-06-25 12:40:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								84f9ca1956 
								
							 
						 
						
							
							
								
								Blocking: Don't federate if the options is set.  
							
							
							
						 
						
							2020-06-25 12:03:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								44bb7cfccd 
								
							 
						 
						
							
							
								
								ActivityPub: Remove block.  
							
							
							
						 
						
							2020-06-25 11:51:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e38293c8f1 
								
							 
						 
						
							
							
								
								Transmogrifier: Switch to pipeline for Blocks.  
							
							
							
						 
						
							2020-06-25 11:33:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								89e5b2046b 
								
							 
						 
						
							
							
								
								ObjectValidator: Basic Block support.  
							
							
							
						 
						
							2020-06-25 11:13:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								35f6770436 
								
							 
						 
						
							
							
								
								StatusView: Add pleroma.parent_visible  
							
							
							
						 
						
							2020-06-24 13:29:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								98af7b59e4 
								
							 
						 
						
							
							
								
								Merge branch 'update-validator' into 'develop'  
							
							... 
							
							
							
							Update validator
See merge request pleroma/pleroma!2668  
							
						 
						
							2020-06-23 18:10:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c7d69e9256 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'  
							
							... 
							
							
							
							Moving mrf settings from instance to separate mrf group
Closes  #1631 
See merge request pleroma/pleroma!2320  
							
						 
						
							2020-06-23 16:38:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aee815b478 
								
							 
						 
						
							
							
								
								ObjectValidator: Clarify type of object.  
							
							
							
						 
						
							2020-06-23 12:37:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2c603f2009 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator  
							
							
							
						 
						
							2020-06-23 10:17:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c116b6d6d6 
								
							 
						 
						
							
							
								
								ActivityPubController: Update upload_media @doc  
							
							... 
							
							
							
							Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810  
							
						 
						
							2020-06-23 04:42:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e785cd5cae 
								
							 
						 
						
							
							
								
								ActivityPub: Remove update and switch to pipeline.  
							
							
							
						 
						
							2020-06-22 13:59:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c75ba63bef 
								
							 
						 
						
							
							
								
								Merge branch '1865-media-only' into 'develop'  
							
							... 
							
							
							
							Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes  #1865 
See merge request pleroma/pleroma!2650  
							
						 
						
							2020-06-22 11:34:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9438f83f83 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle Update with the pipeline.  
							
							
							
						 
						
							2020-06-22 13:16:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								31a4d42ce0 
								
							 
						 
						
							
							
								
								SideEffects: Handle user updating.  
							
							
							
						 
						
							2020-06-22 13:15:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								35e9282ffd 
								
							 
						 
						
							
							
								
								HellthreadPolicy: Restrict to Notes and Articles.  
							
							
							
						 
						
							2020-06-22 10:35:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d542450b1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into '1865-media-only'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-06-20 09:33:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d4cfc9c5f 
								
							 
						 
						
							
							
								
								Stop filling conversation field on incoming objects (legacy, unused)  
							
							... 
							
							
							
							conversation field is still set for outgoing federation for compatibility. 
							
						 
						
							2020-06-20 00:08:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								75670a99e4 
								
							 
						 
						
							
							
								
								UpdateValidator: Only allow updates from the user themselves.  
							
							
							
						 
						
							2020-06-19 16:38:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								abdb540d45 
								
							 
						 
						
							
							
								
								ObjectValidators: Add basic UpdateValidator.  
							
							
							
						 
						
							2020-06-19 15:30:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d772361e62 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1787-mogrify-args' into 'develop'  
							
							... 
							
							
							
							Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652  
							
						 
						
							2020-06-17 15:53:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a77b0388f4 
								
							 
						 
						
							
							
								
								credo fix  
							
							
							
						 
						
							2020-06-17 10:31:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3 
								
							 
						 
						
							
							
								
								moving mrf settings from instance to separate group  
							
							
							
						 
						
							2020-06-16 18:32:18 +03:00