rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								65db5e9f52 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							
							
						 
						
							2019-06-01 16:29:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d9c0650ff9 
								
							 
						 
						
							
							
								
								Mastodon API: Fix lists leaking private posts  
							
							... 
							
							
							
							Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM 
							
						 
						
							2019-05-31 15:25:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a9eaa55885 
								
							 
						 
						
							
							
								
								Fix fix_explicit_addressing moving follower collection to cc and add tests for it  
							
							
							
						 
						
							2019-05-31 14:17:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								79503ce90f 
								
							 
						 
						
							
							
								
								mrf: simple policy: fix matching imported activitypub and ostatus statuses  
							
							
							
						 
						
							2019-05-26 02:01:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8086c7aed6 
								
							 
						 
						
							
							
								
								tests: add tests for banner and avatar removal  
							
							
							
						 
						
							2019-05-22 18:53:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19c90d47c4 
								
							 
						 
						
							
							
								
								Normalize poll votes to Answer objects  
							
							
							
						 
						
							2019-05-22 21:17:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								045803346d 
								
							 
						 
						
							
							
								
								move key generation functions into Pleroma.Keys module  
							
							
							
						 
						
							2019-05-22 03:58:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								aafe30d94e 
								
							 
						 
						
							
							
								
								Handle poll votes  
							
							
							
						 
						
							2019-05-21 14:12:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								2375e9a95b 
								
							 
						 
						
							
							
								
								Add report filtering to MRF.SimplePolicy  
							
							
							
						 
						
							2019-05-20 06:02:50 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5ece901af3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts and remove IO.inspects  
							
							
							
						 
						
							2019-05-18 13:37:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								443cd68a4c 
								
							 
						 
						
							
							
								
								Add tests for MRF.SimplePolicy  
							
							
							
						 
						
							2019-05-17 09:02:34 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								e190b3022b 
								
							 
						 
						
							
							
								
								Merge branch 'fix/domain-unblocked-reblogs' into 'develop'  
							
							... 
							
							
							
							Fix domain-unblocked reblogs
Closes  #892 
See merge request pleroma/pleroma!1157  
							
						 
						
							2019-05-16 18:57:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ebb0482116 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into conversations-import  
							
							
							
						 
						
							2019-05-16 13:11:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								2b6119dfbf 
								
							 
						 
						
							
							
								
								Restrict reblogs of activities from blocked domains  
							
							
							
						 
						
							2019-05-16 05:53:51 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								64495b96e9 
								
							 
						 
						
							
							
								
								Add test for blocked domains  
							
							
							
						 
						
							2019-05-16 05:53:51 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								62e42b03ab 
								
							 
						 
						
							
							
								
								Handle incoming Question objects  
							
							
							
						 
						
							2019-05-15 20:10:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f09c3afdf5 
								
							 
						 
						
							
							
								
								chase test failures  
							
							
							
						 
						
							2019-05-15 16:23:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c7644313e7 
								
							 
						 
						
							
							
								
								test: update obsolete test  
							
							
							
						 
						
							2019-05-15 15:54:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f168a1cbdc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into conversations-import  
							
							
							
						 
						
							2019-05-15 17:47:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb3451023 
								
							 
						 
						
							
							
								
								CommonAPI: Refactor visibility, forbid public to private replies.  
							
							
							
						 
						
							2019-05-15 16:30:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								582bd9d170 
								
							 
						 
						
							
							
								
								tests: fix AP test failures  
							
							
							
						 
						
							2019-05-12 14:40:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a4598b5e8b 
								
							 
						 
						
							
							
								
								Visibility: Make it more resilient.  
							
							
							
						 
						
							2019-05-08 18:08:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								81d1aa424d 
								
							 
						 
						
							
							
								
								Streamer: Stream out Conversations/Participations.  
							
							
							
						 
						
							2019-05-03 13:39:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8af55728e4 
								
							 
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2019-05-01 19:03:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								45f790becc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into conversations_three  
							
							
							
						 
						
							2019-05-01 18:40:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f11e7037c2 
								
							 
						 
						
							
							
								
								test fixes  
							
							
							
						 
						
							2019-05-01 16:09:53 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0fd0ffcd76 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: send reject follow if following does not succeed  
							
							
							
						 
						
							2019-04-25 00:48:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								b9cdf6d3b9 
								
							 
						 
						
							
							
								
								Use User.get_cached* everywhere  
							
							
							
						 
						
							2019-04-22 07:20:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								aef3a3ca46 
								
							 
						 
						
							
							
								
								Fix tests that used finmoji  
							
							
							
						 
						
							2019-04-20 11:34:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9da8b287f8 
								
							 
						 
						
							
							
								
								Merge branch 'feature/database-compaction' into 'develop'  
							
							... 
							
							
							
							database compaction
See merge request pleroma/pleroma!473  
							
						 
						
							2019-04-19 16:55:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								83589ca6a5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							
							
						 
						
							2019-04-18 12:56:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2abc09570f 
								
							 
						 
						
							
							
								
								Use the preloaded object in tag queries  
							
							
							
						 
						
							2019-04-18 01:37:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								36f78c6dcd 
								
							 
						 
						
							
							
								
								activitypub: fix filtering of boosts from blocked users  
							
							
							
						 
						
							2019-04-17 22:27:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2140e164d7 
								
							 
						 
						
							
							
								
								activitypub: properly filter out transitive activities concerning blocked users  
							
							
							
						 
						
							2019-04-17 20:05:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								35ac672b8d 
								
							 
						 
						
							
							
								
								Remove containment tests from transmogrifier and fix thread visibility solver  
							
							
							
						 
						
							2019-04-17 17:59:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d1eb578a57 
								
							 
						 
						
							
							
								
								Refactor tests that used ActivityPub.fetch_object_from_id  
							
							
							
						 
						
							2019-04-17 17:03:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ff8d76c670 
								
							 
						 
						
							
							
								
								Refactor all tests that acessed the embeded object  
							
							
							
						 
						
							2019-04-17 15:46:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								54b82f236b 
								
							 
						 
						
							
							
								
								Fix note count test  
							
							
							
						 
						
							2019-04-17 15:03:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								627e5a0a49 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							
							
						 
						
							2019-04-17 12:22:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								750b369d04 
								
							 
						 
						
							
							
								
								activitypub: allow indirect messages from users being followed at a personal inbox  
							
							
							
						 
						
							2019-04-16 18:31:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5d73dca064 
								
							 
						 
						
							
							
								
								Remove inReplyToStatusId  
							
							
							
						 
						
							2019-04-15 11:50:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								36ec8d9694 
								
							 
						 
						
							
							
								
								ActivityPub: Fix specs.  
							
							
							
						 
						
							2019-04-11 13:20:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								e19590c93f 
								
							 
						 
						
							
							
								
								Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'  
							
							... 
							
							
							
							Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019  
							
						 
						
							2019-04-08 11:42:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								36c0a10fdf 
								
							 
						 
						
							
							
								
								adding language tag  
							
							
							
						 
						
							2019-04-08 11:03:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa6e7289f 
								
							 
						 
						
							
							
								
								Improve Transmogrifier.upgrade_user_from_ap_id/2  
							
							
							
						 
						
							2019-04-04 16:10:43 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								39bcf93007 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into fix-slow-relationships  
							
							
							
						 
						
							2019-04-02 16:10:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fd07745d1b 
								
							 
						 
						
							
							
								
								ActivityPub Utils: Greatly speed up the follow / block activity fetching.  
							
							
							
						 
						
							2019-04-02 16:08:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9a59c26619 
								
							 
						 
						
							
							
								
								replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)  
							
							
							
						 
						
							2019-04-02 17:47:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								11c2d6bdc4 
								
							 
						 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id) in tests  
							
							
							
						 
						
							2019-04-02 17:08:03 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1b3d921921 
								
							 
						 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)  
							
							
							
						 
						
							2019-04-02 17:01:26 +07:00