rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								97b79efbcd 
								
							 
						 
						
							
							
								
								ActivityPub Controller: Actually pass for_user to following/followers  
							
							... 
							
							
							
							views and give 403 errors when trying to request hidden follower pages
when unauthenticated 
							
						 
						
							2019-07-12 20:54:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1f6ac7680d 
								
							 
						 
						
							
							
								
								ActivityPub User view: Following/Followers refactoring  
							
							... 
							
							
							
							- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it 
							
						 
						
							2019-07-12 19:41:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								27ed260eed 
								
							 
						 
						
							
							
								
								AP user view: Add a test for hiding totalItems in following/followers  
							
							
							
						 
						
							2019-07-12 18:36:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								beba7bbc85 
								
							 
						 
						
							
							
								
								removing synchronization worker  
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f8786fa6f2 
								
							 
						 
						
							
							
								
								adding following_address field to user  
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								2d2b50ccca 
								
							 
						 
						
							
							
								
								Send and handle "Delete" activity for deleted users  
							
							
							
						 
						
							2019-07-10 05:16:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								93a0eeab16 
								
							 
						 
						
							
							
								
								Add license/copyright to all project files  
							
							
							
						 
						
							2019-07-10 05:13:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								bb8065a1fd 
								
							 
						 
						
							
							
								
								tests MRF filters  
							
							
							
						 
						
							2019-07-10 05:12:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8a41d34673 
								
							 
						 
						
							
							
								
								[ #878 ] Tests improvements per code review.  
							
							
							
						 
						
							2019-07-09 22:37:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6fc0c27be3 
								
							 
						 
						
							
							
								
								[ #878 ] Uncommented test statement.  
							
							
							
						 
						
							2019-07-09 22:28:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								829e997223 
								
							 
						 
						
							
							
								
								[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs 
							
						 
						
							2019-07-09 21:46:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								95c085174d 
								
							 
						 
						
							
							
								
								Merge branch 'test-speedup' into 'develop'  
							
							... 
							
							
							
							Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391  
							
						 
						
							2019-07-09 15:35:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								abe2e8881f 
								
							 
						 
						
							
							
								
								Testing: Don't federate in testing.  
							
							
							
						 
						
							2019-07-09 15:30:51 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								daff85a985 
								
							 
						 
						
							
							
								
								[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.  
							
							
							
						 
						
							2019-07-08 19:53:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b9d914089 
								
							 
						 
						
							
							
								
								[ #161 ] Refactoring, documentation.  
							
							
							
						 
						
							2019-06-30 15:58:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5b7b1040b3 
								
							 
						 
						
							
							
								
								[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.  
							
							
							
						 
						
							2019-06-29 20:04:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c22f0bfb80 
								
							 
						 
						
							
							
								
								test: add tests for mediaproxy warming policy  
							
							
							
						 
						
							2019-06-28 23:41:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								b37ede5df3 
								
							 
						 
						
							
							
								
								log capturing  
							
							
							
						 
						
							2019-06-23 08:16:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								21dacd4b15 
								
							 
						 
						
							
							
								
								unbreak polls  
							
							
							
						 
						
							2019-06-19 16:33:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								736d8ad6be 
								
							 
						 
						
							
							
								
								implement anti link spam MRF  
							
							
							
						 
						
							2019-06-19 15:58:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								2e2edcb461 
								
							 
						 
						
							
							
								
								capturing errors  
							
							
							
						 
						
							2019-06-16 20:10:12 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dffc9f060a 
								
							 
						 
						
							
							
								
								replace missing mock with a 404  
							
							
							
						 
						
							2019-06-07 20:48:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d020f68e87 
								
							 
						 
						
							
							
								
								Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched  
							
							
							
						 
						
							2019-06-07 20:40:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ad19bfc7fe 
								
							 
						 
						
							
							
								
								Utils: Split update_follow_state and update_follow_state_for_all.  
							
							
							
						 
						
							2019-06-05 16:43:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3115b64cfe 
								
							 
						 
						
							
							
								
								Transmogrifier: Add tests for incoming follows to locked accounts.  
							
							
							
						 
						
							2019-06-05 14:10:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								024dfdc39c 
								
							 
						 
						
							
							
								
								Typo + Linting.  
							
							
							
						 
						
							2019-06-05 12:45:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b9a0dd4a7 
								
							 
						 
						
							
							
								
								User: Don't error out when following a user that's already followed.  
							
							... 
							
							
							
							This leads to a few situations where it is impossible to follow a user. 
							
						 
						
							2019-06-05 12:06:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d3d1704e84 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							
							
						 
						
							2019-06-04 15:06:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bbff7554de 
								
							 
						 
						
							
							
								
								Add tests for get_existing_votes  
							
							
							
						 
						
							2019-06-04 13:47:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f2e359687 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/941  
							
							
							
						 
						
							2019-06-04 09:49:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9f0d0d0805 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mrf-subchain' into 'develop'  
							
							... 
							
							
							
							MRF: subchain policy
See merge request pleroma/pleroma!1233  
							
						 
						
							2019-06-04 05:49:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								080e1aa70e 
								
							 
						 
						
							
							
								
								add option skip_thread_containment  
							
							
							
						 
						
							2019-06-03 16:13:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								026b245dbc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo  
							
							
							
						 
						
							2019-06-03 11:14:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								38a275b31f 
								
							 
						 
						
							
							
								
								test: add tests for subchain policy  
							
							
							
						 
						
							2019-06-02 10:08:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								65db5e9f52 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							
							
						 
						
							2019-06-01 16:29:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e706b42f51 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'  
							
							... 
							
							
							
							visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230  
							
						 
						
							2019-06-01 03:39:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								2bbc2a801f 
								
							 
						 
						
							
							
								
								Remove all follower collections but actor's from "cc"  
							
							
							
						 
						
							2019-06-01 03:26:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f2efe24cf8 
								
							 
						 
						
							
							
								
								visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility  
							
							
							
						 
						
							2019-06-01 03:24:08 +00: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