lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								46c7c2380c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/relay' into 'develop'  
							
							... 
							
							
							
							message relay
Closes  #144 
See merge request pleroma/pleroma!264  
							
						 
						
							2018-08-27 08:29:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								440b459cd1 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/announce-timeline-flooding' into 'develop'  
							
							... 
							
							
							
							activitypub: filter destination list for announce activities differently than normal (closes  #164 )
Closes  #164 
See merge request pleroma/pleroma!227  
							
						 
						
							2018-08-27 08:25:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								63094cfd3e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/emoji-in-local-users' into 'develop'  
							
							... 
							
							
							
							Add emoji to local user profiles.
Closes  #202 
See merge request pleroma/pleroma!271  
							
						 
						
							2018-08-26 23:24:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5bff8c66 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/relay'  
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex 
							
						 
						
							2018-08-26 21:06:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								52b44184b4 
								
							 
						 
						
							
							
								
								transmogrifier: reject activities lacking a valid ID  
							
							
							
						 
						
							2018-08-23 01:25:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f5b056e3ce 
								
							 
						 
						
							
							
								
								[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes  
							
							
							
						 
						
							2018-08-21 18:26:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74c74decf5 
								
							 
						 
						
							
							
								
								Basic peertube support.  
							
							
							
						 
						
							2018-08-21 18:24:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef4f982e2c 
								
							 
						 
						
							
							
								
								Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)  
							
							
							
						 
						
							2018-08-21 18:24:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f1c407e777 
								
							 
						 
						
							
							
								
								Merge branch 'fix/redirect-on-user-fetch' into 'develop'  
							
							... 
							
							
							
							ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278  
							
						 
						
							2018-08-20 12:13:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								51a21284c6 
								
							 
						 
						
							
							
								
								ActivityPub: follow redirects when fetching user  
							
							
							
						 
						
							2018-08-20 15:03:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5fbb14f5ec 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/federation-kroeg' into 'develop'  
							
							... 
							
							
							
							fix federation with kroeg
See merge request pleroma/pleroma!272  
							
						 
						
							2018-08-16 15:20:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								38361e7b5e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'  
							
							... 
							
							
							
							Fix: Output repeats at ActivityPub outbox
Closes  #191 
See merge request pleroma/pleroma!175  
							
						 
						
							2018-08-16 15:19:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f446e75577 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: add necessary translations for kroeg  
							
							
							
						 
						
							2018-08-14 17:09:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed1ff17a4 
								
							 
						 
						
							
							
								
								ActivityPub user view: include tag if present.  
							
							
							
						 
						
							2018-08-13 16:11:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								de6be63b1b 
								
							 
						 
						
							
							
								
								activitypub: do not show observable effects of non-public boosts  
							
							
							
						 
						
							2018-08-06 11:28:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0ca9b9ff96 
								
							 
						 
						
							
							
								
								run mix format  
							
							
							
						 
						
							2018-08-06 08:26:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1e1a29f084 
								
							 
						 
						
							
							
								
								activitypub: relay: fix up AS2 actor object  
							
							
							
						 
						
							2018-08-06 08:22:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2b628f2341 
								
							 
						 
						
							
							
								
								relay: only relay create activities  
							
							
							
						 
						
							2018-08-06 08:22:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56dc8db582 
								
							 
						 
						
							
							
								
								activitypub: relay: add relay following/followers collection URLs  
							
							
							
						 
						
							2018-08-06 08:22:14 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								1c90f88393 
								
							 
						 
						
							
							
								
								user: remote actors can have no nickname if they are virtual services  
							
							
							
						 
						
							2018-08-06 08:22:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b7ca7f282a 
								
							 
						 
						
							
							
								
								activitypub: refactor relay concerns into new relay module  
							
							
							
						 
						
							2018-08-06 08:22:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								00e890264c 
								
							 
						 
						
							
							
								
								activitypub: represent relay actor at instance root  
							
							
							
						 
						
							2018-08-06 08:22:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3be58ad34e 
								
							 
						 
						
							
							
								
								activitypub: actually send digest header when federating  
							
							... 
							
							
							
							this is needed for backwards compatibility with non-digest pleroma instances 
							
						 
						
							2018-08-01 10:32:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2890aef9e8 
								
							 
						 
						
							
							
								
								activitypub: add digest header to outbound messages and sign it  
							
							
							
						 
						
							2018-07-31 23:24:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7501481db4 
								
							 
						 
						
							
							
								
								[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding  
							
							
							
						 
						
							2018-07-12 23:37:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8472fba2a7 
								
							 
						 
						
							
							
								
								[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object  
							
							... 
							
							
							
							The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club> 
							
						 
						
							2018-07-12 23:37:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								d93789dfde 
								
							 
						 
						
							
							
								
								Merge branch 'feature/object-normalization' into 'develop'  
							
							... 
							
							
							
							object normalization
See merge request pleroma/pleroma!238  
							
						 
						
							2018-07-12 16:48:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								590d4df77c 
								
							 
						 
						
							
							
								
								activitypub: more robustly handle object-to-actor associations  
							
							
							
						 
						
							2018-07-12 16:39:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								4a922305af 
								
							 
						 
						
							
							
								
								Merge branch 'feature/article-support' into 'develop'  
							
							... 
							
							
							
							article support (plume, etc)
See merge request pleroma/pleroma!240  
							
						 
						
							2018-07-12 05:58:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8546551257 
								
							 
						 
						
							
							
								
								activitypub: switch to using x509 representation for public keys instead of pkcs#1  
							
							
							
						 
						
							2018-07-12 03:30:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								971bb4f2bd 
								
							 
						 
						
							
							
								
								activity interpretation: formatting  
							
							
							
						 
						
							2018-06-27 13:38:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								bd479606ba 
								
							 
						 
						
							
							
								
								utils: make_create_data: add support for Article objects  
							
							
							
						 
						
							2018-06-27 13:37:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c42f28b82c 
								
							 
						 
						
							
							
								
								transmogrifier: accept Article activities  
							
							
							
						 
						
							2018-06-27 13:37:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7c63e70de1 
								
							 
						 
						
							
							
								
								activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:08:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								15d624e077 
								
							 
						 
						
							
							
								
								activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc96f222c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configurable-blocks' into 'develop'  
							
							... 
							
							
							
							Add more configurability to how blocks work
See merge request pleroma/pleroma!203  
							
						 
						
							2018-06-25 06:12:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea214b8ba6 
								
							 
						 
						
							
							
								
								combined outgoing_blocks with statement  
							
							
							
						 
						
							2018-06-24 23:05:44 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4038ede07 
								
							 
						 
						
							
							
								
								fix mind-crushingly dumb syntax error  
							
							
							
						 
						
							2018-06-23 14:32:00 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4990283de 
								
							 
						 
						
							
							
								
								change moved attributes into normal variables  
							
							
							
						 
						
							2018-06-23 14:27:07 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e099fcfa9 
								
							 
						 
						
							
							
								
								move configurable module attributes into relevant functions  
							
							
							
						 
						
							2018-06-23 14:16:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c45133377a 
								
							 
						 
						
							
							
								
								lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format  
							
							... 
							
							
							
							Hnng! 
							
						 
						
							2018-06-23 16:12:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								60d6038be5 
								
							 
						 
						
							
							
								
								mrf simple: add accept lists  
							
							... 
							
							
							
							accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space. 
							
						 
						
							2018-06-19 21:28:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								90cf75f4a7 
								
							 
						 
						
							
							
								
								Merge branch 'features/column_media_streaming' into 'develop'  
							
							... 
							
							
							
							Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225  
							
						 
						
							2018-06-19 09:50:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								db0731b6ac 
								
							 
						 
						
							
							
								
								Merge branch 'feature/exclude-replies-filter' into 'develop'  
							
							... 
							
							
							
							activitypub: support filtering activities by whether or not they are a reply (closes  #109 )
Closes  #109 
See merge request pleroma/pleroma!226  
							
						 
						
							2018-06-19 05:15:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c95941e64d 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: fix handling of contentMap.  
							
							
							
						 
						
							2018-06-18 22:14:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								591c82620e 
								
							 
						 
						
							
							
								
								activitypub: filter destination list for announce activities differently than normal ( closes   #164 )  
							
							
							
						 
						
							2018-06-18 04:36:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4f589998ee 
								
							 
						 
						
							
							
								
								activitypub: support filtering activities by whether or not they are a reply ( closes   #109 )  
							
							
							
						 
						
							2018-06-18 03:21:32 +00:00