Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								bdfa3a6fa8
								
							
						 | 
						
							
							
								
								Merging with develop
							
							
							
							
							
							
							
							Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex 
							
						 | 
						
							2019-05-01 12:29:33 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								4cedf45423
								
							
						 | 
						
							
							
								
								relay: use preloaded object since we always have it
							
							
							
							
							
						 | 
						
							2019-03-23 02:28:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zachary Dunn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2e03d4f3c
								
							
						 | 
						
							
							
								
								Initial attempt at updating return type
							
							
							
							
							
						 | 
						
							2019-03-18 13:56:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251
								
							
						 | 
						
							
							
								
								de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-09 16:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e9f1d5587
								
							
						 | 
						
							
							
								
								activitypub: relay: chase selective public announce changes
							
							
							
							
							
						 | 
						
							2019-01-17 23:21:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2791ce9a1f
								
							
						 | 
						
							
							
								
								add license boilerplate to pleroma core
							
							
							
							
							
						 | 
						
							2018-12-23 20:56:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								12ccf0c4f8
								
							
						 | 
						
							
							
								
								Change Relay from status to {status, message}
							
							
							
							
							
						 | 
						
							2018-11-17 22:12:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								265c8c5209
								
							
						 | 
						
							
							
								
								Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
							
							
							
							
							
						 | 
						
							2018-11-17 20:25:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b628f2341
								
							
						 | 
						
							
							
								
								relay: only relay create activities
							
							
							
							
							
						 | 
						
							2018-08-06 08:22:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c40a631e8
								
							
						 | 
						
							
							
								
								federator: actually relay the public activities
							
							
							
							
							
						 | 
						
							2018-08-06 08:22:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								266b314051
								
							
						 | 
						
							
							
								
								relay: fix invoking federator, use a timer to sleep the mix task to force a context switch
							
							
							
							
							
						 | 
						
							2018-08-06 08:22:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								99be3d3dcc
								
							
						 | 
						
							
							
								
								relay: add relay follow/unfollow tasks
							
							
							
							
							
						 | 
						
							2018-08-06 08:22:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								b7ca7f282a
								
							
						 | 
						
							
							
								
								activitypub: refactor relay concerns into new relay module
							
							
							
							
							
						 | 
						
							2018-08-06 08:22:10 +00:00 | 
						
						
							
							
							
								
							
							
						 |