rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fb96facc32 
								
							 
						 
						
							
							
								
								Remove unused functions and fix credo issues  
							
							
							
						 
						
							2019-09-13 12:29:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce23529d91 
								
							 
						 
						
							
							
								
								Use delivery info when federating deletes  
							
							
							
						 
						
							2019-09-13 11:38:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b40e57a72 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-13 06:55:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								769fb778d4 
								
							 
						 
						
							
							
								
								Track object/create activity fetches  
							
							
							
						 
						
							2019-09-12 21:37:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								102eb4455c 
								
							 
						 
						
							
							
								
								Fix associated test as well  
							
							
							
						 
						
							2019-09-12 12:29:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8d4b661ecb 
								
							 
						 
						
							
							
								
								Transmogrifier: Strip internal emoji reaction fields.  
							
							
							
						 
						
							2019-09-12 18:59:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								007e0c1ce1 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2019-09-11 23:19:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								fcf604fa43 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2019-09-11 07:23:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a31af93e1d 
								
							 
						 
						
							
							
								
								added tests /activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-10 16:43:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								11e12b5761 
								
							 
						 
						
							
							
								
								Add Pleroma.Plugs.Cache  
							
							
							
						 
						
							2019-09-09 18:53:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e0f84d0043 
								
							 
						 
						
							
							
								
								Fix ActivityPubController.read_inbox/2  
							
							
							
						 
						
							2019-09-10 01:11:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8cbad5500c 
								
							 
						 
						
							
							
								
								add tests for activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 15:25:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9bc12b88b3 
								
							 
						 
						
							
							
								
								ActivityPub: Save emoji reactions in object.  
							
							
							
						 
						
							2019-09-03 16:50:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a90ea8ba15 
								
							 
						 
						
							
							
								
								[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).  
							
							
							
						 
						
							2019-08-31 19:08:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e890ea7e82 
								
							 
						 
						
							
							
								
								[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2019-08-31 14:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								d9d7765383 
								
							 
						 
						
							
							
								
								Merge branch 'fix-osada-follow' into 'develop'  
							
							... 
							
							
							
							Transmogrifier: Fix follow handling when the actor is an object.
Closes  #1211 
See merge request pleroma/pleroma!1604  
							
						 
						
							2019-08-28 07:10:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f017260cdc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-08-27 16:38:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								00abe099cd 
								
							 
						 
						
							
							
								
								added tests for ActivityPub.like\unlike  
							
							
							
						 
						
							2019-08-27 16:21:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a0b21c8928 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle incoming emoji reactions.  
							
							
							
						 
						
							2019-08-26 16:47:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6e1ec4c5da 
								
							 
						 
						
							
							
								
								ActivityPub: Basic EmojiReactions.  
							
							
							
						 
						
							2019-08-26 16:29:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3da65292b3 
								
							 
						 
						
							
							
								
								Transmogrifier: Fix follow handling when the actor is an object.  
							
							
							
						 
						
							2019-08-26 14:34:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6dc24422dc 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1177' into 'develop'  
							
							... 
							
							
							
							[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589  
							
						 
						
							2019-08-25 19:43:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d74efde94e 
								
							 
						 
						
							
							
								
								Update test for custom profile fields  
							
							
							
						 
						
							2019-08-26 02:06:52 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								654d291b6d 
								
							 
						 
						
							
							
								
								update tests  
							
							
							
						 
						
							2019-08-24 17:41:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								73bcbf4fa3 
								
							 
						 
						
							
							
								
								add tests  
							
							
							
						 
						
							2019-08-24 11:03:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								399ca9133b 
								
							 
						 
						
							
							
								
								fix test  
							
							
							
						 
						
							2019-08-22 21:54:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f95b67c933 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1177  
							
							
							
						 
						
							2019-08-22 21:13:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7101ba1a21 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							
							
						 
						
							2019-08-22 21:01:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								256ff09aa8 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 
						
							2019-08-22 20:59:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								64bfb41c55 
								
							 
						 
						
							
							
								
								fixed unfollow for relay actor  
							
							
							
						 
						
							2019-08-22 06:57:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								85bd8a4e31 
								
							 
						 
						
							
							
								
								fixed clear config after test  
							
							
							
						 
						
							2019-08-21 21:24:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ef43016b2c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/custom-fields' into 'develop'  
							
							... 
							
							
							
							Add custom profile fields
See merge request pleroma/pleroma!1488  
							
						 
						
							2019-08-20 12:44:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								a320358703 
								
							 
						 
						
							
							
								
								added test helpers to clear config after tests  
							
							
							
						 
						
							2019-08-19 15:34:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								a2fdc32368 
								
							 
						 
						
							
							
								
								tests: activitypub: fix typo  
							
							
							
						 
						
							2019-08-18 22:31:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a4a3e3becd 
								
							 
						 
						
							
							
								
								Hide muted theads from home/public timelines unless with_muted is set  
							
							
							
						 
						
							2019-08-15 17:37:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8778c16dac 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							
							
						 
						
							2019-08-14 21:44:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e457fcc479 
								
							 
						 
						
							
							
								
								Add :max_remote_account_fields config option  
							
							
							
						 
						
							2019-08-14 14:58:06 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f7bbf99caa 
								
							 
						 
						
							
							
								
								Use info.fields instead of source_data for remote users  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								7d6f8a7fd7 
								
							 
						 
						
							
							
								
								Linkify custom fields values in ActivityPub.UserViewx  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5178f960c3 
								
							 
						 
						
							
							
								
								Support user attachment update in Transmogrifier  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								88598c9baf 
								
							 
						 
						
							
							
								
								Add profile custom fields to ActivityPub.UserView  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9ef31767f2 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mrf-vocabulary' into 'develop'  
							
							... 
							
							
							
							MRF Vocabulary
See merge request pleroma/pleroma!1559  
							
						 
						
							2019-08-13 22:51:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								dd0b71ea6d 
								
							 
						 
						
							
							
								
								tests: add tests for MRF.describe()  
							
							
							
						 
						
							2019-08-13 22:19:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								fea4d89e9f 
								
							 
						 
						
							
							
								
								tests for Web/ActivityPub/Relay  
							
							
							
						 
						
							2019-08-13 21:12:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e3b7ff75 
								
							 
						 
						
							
							
								
								tests: add tests for mrf_vocabulary  
							
							
							
						 
						
							2019-08-13 20:55:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0e1c481a94 
								
							 
						 
						
							
							
								
								[ #1149 ] Added more oban workers. Refactoring.  
							
							
							
						 
						
							2019-08-13 20:20:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								9cfc289594 
								
							 
						 
						
							
							
								
								MRF: ensure that subdomain_match calls are case-insensitive  
							
							
							
						 
						
							2019-08-10 21:19:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								af4cf35e20 
								
							 
						 
						
							
							
								
								Strip internal fields including likes from incoming and outgoing activities  
							
							
							
						 
						
							2019-08-10 18:47:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								267262491e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							
							
						 
						
							2019-08-09 20:09:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b7fad8d395 
								
							 
						 
						
							
							
								
								[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.  
							
							
							
						 
						
							2019-08-09 20:08:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								32018a4ee0 
								
							 
						 
						
							
							
								
								ActivityPub tests: remove assertions of embedded object being updated,  
							
							... 
							
							
							
							because the objects are no longer supposed to be embedded 
							
						 
						
							2019-08-07 00:36:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e8ad116c2a 
								
							 
						 
						
							
							
								
								Do not add the "next" key to likes.json if there is no more items  
							
							
							
						 
						
							2019-08-04 17:13:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								23d279e03e 
								
							 
						 
						
							
							
								
								[ #1149 ] Replaced RetryQueue with oban-based retries.  
							
							
							
						 
						
							2019-08-01 17:28:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								301ea0dc04 
								
							 
						 
						
							
							
								
								Add tests for counters being updated on follow  
							
							
							
						 
						
							2019-07-31 21:09:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								41e0304757 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/hide-follows-remote  
							
							
							
						 
						
							2019-07-25 18:43:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c49a09ed88 
								
							 
						 
						
							
							
								
								tests for Pleroma.Web.ActivityPub.Publisher  
							
							
							
						 
						
							2019-07-23 19:15:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								b70e659304 
								
							 
						 
						
							
							
								
								Feature/1087 wildcard option for blocks  
							
							
							
						 
						
							2019-07-22 14:33:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								56019d53a8 
								
							 
						 
						
							
							
								
								activitypub: publisher: align sharedinbox usage with AP specification rules  
							
							... 
							
							
							
							While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification.  Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification. 
							
						 
						
							2019-07-22 02:38:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								196cad46f3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							
							
						 
						
							2019-07-20 22:04:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								3d23a12d75 
								
							 
						 
						
							
							
								
								tests: add test for fetching the internal fetch actor  
							
							
							
						 
						
							2019-07-17 17:48:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									RX14 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								96a2890a9e 
								
							 
						 
						
							
							
								
								Add MRF MentionPolicy for dropping posts which mention specific actors  
							
							
							
						 
						
							2019-07-17 15:16:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								de13c9bb8f 
								
							 
						 
						
							
							
								
								List messages must be visible for mentioned users  
							
							
							
						 
						
							2019-07-15 14:54:40 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								841314c2d5 
								
							 
						 
						
							
							
								
								tests: fix object containment violations in the transmogrifier tests  
							
							... 
							
							
							
							Some objects were not completely rewritten in the tests, which caused object
containment violations.  Fix them by rewriting the object IDs to be in an
appropriate namespace. 
							
						 
						
							2019-07-14 19:24:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2dcb4c69 
								
							 
						 
						
							
							
								
								Add follow information refetching after following/unfollowing  
							
							
							
						 
						
							2019-07-14 01:58:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								183da33e00 
								
							 
						 
						
							
							
								
								Add tests for fetch_follow_information_for_user and check object type  
							
							... 
							
							
							
							when fetching the page 
							
						 
						
							2019-07-14 00:56:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e8fa477793 
								
							 
						 
						
							
							
								
								Refactor Follows/Followers counter syncronization  
							
							... 
							
							
							
							- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page 
							
						 
						
							2019-07-13 19:27:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9e06873d58 
								
							 
						 
						
							
							
								
								Add list to Visibility  
							
							
							
						 
						
							2019-07-11 19:29:24 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								182f7bbb11 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-11 13:26:59 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6ba9055b51 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-05 12:54:30 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9ce928d823 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-04 16:28:23 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a7affbdd6d 
								
							 
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2019-05-24 21:41:11 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f333041a0a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-24 21:05:57 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								557f0e33a7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-17 19:57:14 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								fc7246d715 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-16 17:54:24 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d474995efa 
								
							 
						 
						
							
							
								
								Add Tests  
							
							
							
						 
						
							2019-05-14 20:12:47 +07: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