kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								42612b1c8d 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/improve-boost-targeting' into 'develop'  
							
							... 
							
							
							
							improve handling of non-public Announces
See merge request pleroma/pleroma!681  
							
						 
						
							2019-01-19 23:44:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								75a9b2a851 
								
							 
						 
						
							
							
								
								activitypub: add a match clause for objects, not just activities  
							
							
							
						 
						
							2019-01-17 23:32:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								dbc4e92509 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: do not clobber the addressing on relayed announcements  
							
							
							
						 
						
							2019-01-17 23:21:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								33b473cc02 
								
							 
						 
						
							
							
								
								activitypub: allow is_public?() to work on any type of map representing an AS2 object  
							
							
							
						 
						
							2019-01-17 23:21:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8e9f1d5587 
								
							 
						 
						
							
							
								
								activitypub: relay: chase selective public announce changes  
							
							
							
						 
						
							2019-01-17 23:21:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2479e88815 
								
							 
						 
						
							
							
								
								activitypub: announce: add new public parameter  
							
							
							
						 
						
							2019-01-17 23:21:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								948fba6f76 
								
							 
						 
						
							
							
								
								Fix bad link in likes collection  
							
							... 
							
							
							
							Don't copy and paste, mkay 
							
						 
						
							2019-01-17 18:21:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								fd2f1258fb 
								
							 
						 
						
							
							
								
								Merge branch 'load-all-dms' into 'develop'  
							
							... 
							
							
							
							Remove recent activity restriction.
See merge request pleroma/pleroma!644  
							
						 
						
							2019-01-14 18:49:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								fa0392e49c 
								
							 
						 
						
							
							
								
								Merge branch 'activitypub-likes' into 'develop'  
							
							... 
							
							
							
							Activitypub c2s likes
See merge request pleroma/pleroma!658  
							
						 
						
							2019-01-14 07:27:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6e5b0406b9 
								
							 
						 
						
							
							
								
								mrf: add no placeholder-text policy, strips pointless "." content from posts with images  
							
							
							
						 
						
							2019-01-14 05:42:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								868034375c 
								
							 
						 
						
							
							
								
								Add likes to activitypub object representation  
							
							... 
							
							
							
							Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total. 
							
						 
						
							2019-01-12 20:24:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								581edd5a91 
								
							 
						 
						
							
							
								
								Add route to get object like activities  
							
							
							
						 
						
							2019-01-12 20:24:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								36711e1c83 
								
							 
						 
						
							
							
								
								Handle client submitted activitypub like activity  
							
							
							
						 
						
							2019-01-12 20:24:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								1eb7318831 
								
							 
						 
						
							
							
								
								Prepare all types objects before serialising  
							
							... 
							
							
							
							Activities returned from inbox can include other types of objects like
Article 
							
						 
						
							2019-01-12 20:24:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e4afe1359b 
								
							 
						 
						
							
							
								
								Merge branch 'activitypub-dereference-activity-id' into 'develop'  
							
							... 
							
							
							
							Support activity+json request for activity
See merge request pleroma/pleroma!641  
							
						 
						
							2019-01-10 18:42:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7f5efddd6e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/pinned-posts' into 'develop'  
							
							... 
							
							
							
							Pinned Statuses
Closes  #440 
See merge request pleroma/pleroma!636  
							
						 
						
							2019-01-10 02:39:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5027f82cde 
								
							 
						 
						
							
							
								
								Add activity visibility index.  
							
							
							
						 
						
							2019-01-09 16:45:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9854978b8b 
								
							 
						 
						
							
							
								
								Remove recent activity restriction.  
							
							... 
							
							
							
							This should be fine now, everything should be covered by indices. 
							
						 
						
							2019-01-09 12:38:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								20c0dd1e24 
								
							 
						 
						
							
							
								
								Support activity+json request for activity  
							
							
							
						 
						
							2019-01-09 09:33:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								380e9fba21 
								
							 
						 
						
							
							
								
								add pinned posts  
							
							
							
						 
						
							2019-01-07 20:45:33 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								2d7da5f437 
								
							 
						 
						
							
							
								
								Don't crash on AP request for tombstone  
							
							... 
							
							
							
							Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api 
							
						 
						
							2019-01-05 11:16:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								4e1cc2bab6 
								
							 
						 
						
							
							
								
								Implement delete activity  
							
							
							
						 
						
							2019-01-01 23:20:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								551c3d9391 
								
							 
						 
						
							
							
								
								Split create activity specifics from update_outbox  
							
							
							
						 
						
							2019-01-01 23:20:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								096a927805 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pool-usage  
							
							
							
						 
						
							2019-01-01 14:19:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d4799e0dc2 
								
							 
						 
						
							
							
								
								Remove default pool, it's used automatically anyway.  
							
							
							
						 
						
							2019-01-01 13:49:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								f40562b4e1 
								
							 
						 
						
							
							
								
								Respond with full activity to outbox post  
							
							
							
						 
						
							2018-12-30 12:01:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								1e781715c8 
								
							 
						 
						
							
							
								
								Limit activity types accepted to outbox to only 'Create'  
							
							
							
						 
						
							2018-12-30 12:01:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								569bad8210 
								
							 
						 
						
							
							
								
								Create activity when client posts to outbox  
							
							
							
						 
						
							2018-12-30 12:01:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								26dc2dddab 
								
							 
						 
						
							
							
								
								Implement ActivityPub inbox view  
							
							... 
							
							
							
							More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported 
							
						 
						
							2018-12-30 12:01:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								aa082ca7b6 
								
							 
						 
						
							
							
								
								Wire up stub routes for client calls of activitypub inbox/outbox  
							
							... 
							
							
							
							Code style: remove wrapping function of outbox 
							
						 
						
							2018-12-29 22:22:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3dc5f04976 
								
							 
						 
						
							
							
								
								Merge branch 'carrot-bullying' into 'develop'  
							
							... 
							
							
							
							Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595  
							
						 
						
							2018-12-29 11:46:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vyr Cossont 
								
							 
						 
						
							
							
							
							
								
							
							
								e4562105e7 
								
							 
						 
						
							
							
								
								Implement exclude_reblogs and include_rts  
							
							
							
						 
						
							2018-12-26 21:38:00 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5811e65e67 
								
							 
						 
						
							
							
								
								Add some hard limits on inserted activities.  
							
							
							
						 
						
							2018-12-26 12:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								71f6d9f418 
								
							 
						 
						
							
							
								
								transmogrifier: significantly rework handling of peertube videos, add test  
							
							
							
						 
						
							2018-12-23 13:31:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								3aff8067e4 
								
							 
						 
						
							
							
								
								transmogrifier: When it’s a Video move "url" to "attachment"  
							
							
							
						 
						
							2018-12-23 13:00:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								a7f07bb6e5 
								
							 
						 
						
							
							
								
								Implement kaniini's tweaks  
							
							
							
						 
						
							2018-12-23 12:24:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c76179419d 
								
							 
						 
						
							
							
								
								Renamed the things  
							
							
							
						 
						
							2018-12-23 11:14:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								409ff60bf8 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2018-12-22 23:32:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								92362e1e22 
								
							 
						 
						
							
							
								
								Implement large thread filter  
							
							
							
						 
						
							2018-12-22 23:18:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								abead01ab6 
								
							 
						 
						
							
							
								
								Merge branch 'correct-and-improve-http-options' into 'develop'  
							
							... 
							
							
							
							Correct and improve http options
See merge request pleroma/pleroma!505  
							
						 
						
							2018-12-06 15:57:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b0adea30b3 
								
							 
						 
						
							
							
								
								Merge branch 're-mrf' into 'develop'  
							
							... 
							
							
							
							Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499  
							
						 
						
							2018-12-06 15:36:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								d27e3f269f 
								
							 
						 
						
							
							
								
								Rename regular expression 'have_re' to 'reply_prefix'.  
							
							
							
						 
						
							2018-12-06 14:00:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								3dff61ebec 
								
							 
						 
						
							
							
								
								Harden re: detection.  
							
							
							
						 
						
							2018-12-06 13:48:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								6a6aaa0e1a 
								
							 
						 
						
							
							
								
								Use object.normalize.  
							
							
							
						 
						
							2018-12-06 11:37:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								a09ed0f5af 
								
							 
						 
						
							
							
								
								avoid mix format bug  
							
							
							
						 
						
							2018-12-06 18:41:29 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ccf0b46dd6 
								
							 
						 
						
							
							
								
								Merge branch '210_twitter_api_uploads_alt_text' into 'develop'  
							
							... 
							
							
							
							[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496  
							
						 
						
							2018-12-06 07:36:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e90f688f1 
								
							 
						 
						
							
							
								
								[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.  
							
							... 
							
							
							
							Refactoring. 
							
						 
						
							2018-12-06 10:26:17 +03:00