lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c23cb8d37a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-05-04 19:24:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0f9bed022f 
								
							 
						 
						
							
							
								
								LikeValidator: Fix up context.  
							
							 
							
							
							
						 
						
							2020-05-04 17:18:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e03c301ebe 
								
							 
						 
						
							
							
								
								LikeValidator: Fix up missing recipients.  
							
							 
							
							
							
						 
						
							2020-05-04 17:08:31 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								335aabc39c 
								
							 
						 
						
							
							
								
								Transmogrifier tests: Extract like tests.  
							
							 
							
							
							
						 
						
							2020-05-04 14:45:28 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c40afe5ba0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-05-04 10:43:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e55876409b 
								
							 
						 
						
							
							
								
								Deactivate local users on deletion instead of deleting the record  
							
							 
							
							... 
							
							
							
							Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes  pleroma/pleroma#1687  
							
						 
						
							2020-05-02 19:05:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2d07ed7747 
								
							 
						 
						
							
							
								
								[ #1732 ] Made AP C2S :followers and :following endpoints serve on no auth  
							
							 
							
							... 
							
							
							
							(as for related :api pipeline endpoints). 
							
						 
						
							2020-05-02 18:28:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								44fbd09709 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1577' into 'develop'  
							
							 
							
							... 
							
							
							
							[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372  
							
						 
						
							2020-05-01 12:38:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f1523f9acd 
								
							 
						 
						
							
							
								
								Increase tests on AP C2S  
							
							 
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954  
							
						 
						
							2020-04-30 18:56:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								20587aa931 
								
							 
						 
						
							
							
								
								Chat message creation: Check actor.  
							
							 
							
							
							
						 
						
							2020-04-29 14:53:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a88734a0a2 
								
							 
						 
						
							
							
								
								Transmogrifier: Fetch missing actors for chatmessages.  
							
							 
							
							
							
						 
						
							2020-04-29 14:25:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e055b8d203 
								
							 
						 
						
							
							
								
								Pipeline: Always run common_pipeline in a transaction for now.  
							
							 
							
							
							
						 
						
							2020-04-29 13:45:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0c491b904d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-29 13:19:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7bd187bc5e 
								
							 
						 
						
							
							
								
								added test  
							
							 
							
							
							
						 
						
							2020-04-29 08:13:10 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								908cf22a6c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex 
							
						 
						
							2020-04-28 19:56:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dedffd100c 
								
							 
						 
						
							
							
								
								Pipeline: Unify, refactor, DRY.  
							
							 
							
							
							
						 
						
							2020-04-28 17:29:54 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								abd0928229 
								
							 
						 
						
							
							
								
								CreateChatMessageValidator: Validate object existence  
							
							 
							
							
							
						 
						
							2020-04-28 16:45:28 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa116eca7 
								
							 
						 
						
							
							
								
								Create activity handling: Flip it and reverse it  
							
							 
							
							... 
							
							
							
							Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object. 
							
						 
						
							2020-04-28 16:26:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								906cf53ab9 
								
							 
						 
						
							
							
								
								Recipient Type: Cast all elements as ObjectIDs.  
							
							 
							
							
							
						 
						
							2020-04-28 13:38:02 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ea5142b94b 
								
							 
						 
						
							
							
								
								convert markdown content to html  
							
							 
							
							
							
						 
						
							2020-04-28 09:32:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c86143ed73 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-27 12:07:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d89cd0a197 
								
							 
						 
						
							
							
								
								Reply Filtering: Refactor.  
							
							 
							
							
							
						 
						
							2020-04-24 18:25:26 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e625a427c 
								
							 
						 
						
							
							
								
								reply filtering  
							
							 
							
							
							
						 
						
							2020-04-24 15:43:49 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bbf8554c97 
								
							 
						 
						
							
							
								
								ActivitPub: Remove like function.  
							
							 
							
							... 
							
							
							
							We don't need another way to build likes. 
							
						 
						
							2020-04-24 13:48:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1e28d34592 
								
							 
						 
						
							
							
								
								ChatMessage: Correctly ingest emoji tags.  
							
							 
							
							
							
						 
						
							2020-04-23 16:19:49 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2e62a63749 
								
							 
						 
						
							
							
								
								ChatMessageValidator: Validation changes  
							
							 
							
							... 
							
							
							
							Don't validate if the recipient is blocking the actor. 
							
						 
						
							2020-04-22 12:48:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f685cbd309 
								
							 
						 
						
							
							
								
								Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.  
							
							 
							
							
							
						 
						
							2020-04-21 16:29:19 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5165287ff4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-21 12:00:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bedc558809 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into accept-deletes  
							
							 
							
							
							
						 
						
							2020-04-20 10:15:40 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b54c8813d6 
								
							 
						 
						
							
							
								
								Add :reject_deletes option to SimplePolicy  
							
							 
							
							
							
						 
						
							2020-04-20 10:11:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								8b4de61d64 
								
							 
						 
						
							
							
								
								Fix ObjectAgePolicyTest  
							
							 
							
							... 
							
							
							
							The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests 
							
						 
						
							2020-04-20 12:59:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e53da250e 
								
							 
						 
						
							
							
								
								ChatMessage: Support emoji.  
							
							 
							
							
							
						 
						
							2020-04-20 14:08:54 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								139b9d1338 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-20 12:37:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								970b74383b 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							 
							
							
							
						 
						
							2020-04-20 12:29:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ce23673ca1 
								
							 
						 
						
							
							
								
								ChatMessageValidator: Don't validate messages that are too long.  
							
							 
							
							
							
						 
						
							2020-04-20 11:45:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c845820911 
								
							 
						 
						
							
							
								
								Notifications: Create a chat notification.  
							
							 
							
							
							
						 
						
							2020-04-17 16:55:01 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8c2c325598 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-17 15:51:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								26d9c83316 
								
							 
						 
						
							
							
								
								SideEffects: Test for notification creation.  
							
							 
							
							
							
						 
						
							2020-04-17 15:50:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								372614cfd3 
								
							 
						 
						
							
							
								
								ChatView: Add a mastodon api representation of the recipient.  
							
							 
							
							
							
						 
						
							2020-04-17 15:37:54 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								942d7467ca 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into features/remove-user-source_data  
							
							 
							
							
							
						 
						
							2020-04-16 21:28:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e983f70884 
								
							 
						 
						
							
							
								
								ChatMessagesHandling: Strip HTML of incoming messages.  
							
							 
							
							
							
						 
						
							2020-04-16 17:50:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								252528a4b9 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/remove-upgrade-changeset' into 'develop'  
							
							 
							
							... 
							
							
							
							Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368  
							
						 
						
							2020-04-16 14:59:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e2ced04917 
								
							 
						 
						
							
							
								
								ChatMessages: Better validation.  
							
							 
							
							
							
						 
						
							2020-04-16 15:21:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								44bfb491ea 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							 
							
							
							
						 
						
							2020-04-15 14:41:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c5c09fc61b 
								
							 
						 
						
							
							
								
								fix mediaType of object  
							
							 
							
							
							
						 
						
							2020-04-13 07:02:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a3c74b244 
								
							 
						 
						
							
							
								
								Always accept deletions through SimplePolicy  
							
							 
							
							
							
						 
						
							2020-04-12 20:26:35 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e365448f3 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							 
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-04-11 19:46:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c077ad0b33 
								
							 
						 
						
							
							
								
								Remove User.upgrade_changeset in favor of remote_user_creation  
							
							 
							
							... 
							
							
							
							The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior. 
							
						 
						
							2020-04-11 22:31:46 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								4d33e0bd50 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/apc2s_upload_activity' into 'develop'  
							
							 
							
							... 
							
							
							
							bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316  
							
						 
						
							2020-04-10 04:31:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e89078ac2a 
								
							 
						 
						
							
							
								
								User: remove source_data  
							
							 
							
							
							
						 
						
							2020-04-10 06:20:03 +02:00