Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4333fea1dc 
								
							 
						 
						
							
							
								
								Send "hide_network" in user_view  
							
							 
							
							
							
						 
						
							2019-01-23 19:47:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2de208817c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into rename/pleroma_activity_consistency  
							
							 
							
							
							
						 
						
							2019-01-23 13:05:58 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f9a3269099 
								
							 
						 
						
							
							
								
								Uploader callback controller  
							
							 
							
							
							
						 
						
							2019-01-21 22:44:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								8cd853ce0c 
								
							 
						 
						
							
							
								
								Merge branch '530_federator_user_info_overwrite_fix' into 'develop'  
							
							 
							
							... 
							
							
							
							[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes  #530 
See merge request pleroma/pleroma!691  
							
						 
						
							2019-01-21 13:03:32 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								69454c8345 
								
							 
						 
						
							
							
								
								Merge branch 'feature/dm-sanity' into 'develop'  
							
							 
							
							... 
							
							
							
							DM sanitization
See merge request pleroma/pleroma!458  
							
						 
						
							2019-01-21 12:35:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a4d3fec8a7 
								
							 
						 
						
							
							
								
								[ #502 ] Code comments update.  
							
							 
							
							
							
						 
						
							2019-01-21 14:52:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aa480f4a8b 
								
							 
						 
						
							
							
								
								[ #530 ] Prevents user info from being overwritten because of race conditions  
							
							 
							
							... 
							
							
							
							and non-partial update of embed (in WebFinger.ensure_keys_present and other places). 
							
						 
						
							2019-01-21 14:16:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								98c8184c1f 
								
							 
						 
						
							
							
								
								Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1  
							
							 
							
							
							
						 
						
							2019-01-21 08:00:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2fdbd4d137 
								
							 
						 
						
							
							
								
								Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list  
							
							 
							
							
							
						 
						
							2019-01-21 08:00:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f8ab1b7427 
								
							 
						 
						
							
							
								
								Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1  
							
							 
							
							
							
						 
						
							2019-01-21 08:00:38 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b82c6dc536 
								
							 
						 
						
							
							
								
								Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1  
							
							 
							
							
							
						 
						
							2019-01-21 07:49:59 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cf1f35a93a 
								
							 
						 
						
							
							
								
								Send delete event over Mastodon streaming api  
							
							 
							
							... 
							
							
							
							Closes  #116  
							
						 
						
							2019-01-20 13:00:46 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f3045a179e 
								
							 
						 
						
							
							
								
								Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'  
							
							 
							
							... 
							
							
							
							I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685  
							
						 
						
							2019-01-20 10:24:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								aa37313416 
								
							 
						 
						
							
							
								
								activitypub: short-circuit is_public?() with directMessage flag check  
							
							 
							
							
							
						 
						
							2019-01-20 02:33:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7c9749f793 
								
							 
						 
						
							
							
								
								transmogrifier: slightly clean up fix_explicit_addressing pipeline  
							
							 
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								420651157b 
								
							 
						 
						
							
							
								
								transmogrifier: don't apply heuristics against messages which have directMessage set true  
							
							 
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ddae43eb43 
								
							 
						 
						
							
							
								
								activitypub: add is_private?/is_direct? helpers  
							
							 
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9adc80afff 
								
							 
						 
						
							
							
								
								common api: set directMessage flag on our own posts  
							
							 
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								75dfa1f0b0 
								
							 
						 
						
							
							
								
								mastodon api: get_visibility(): DMs never have a cc list.  
							
							 
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								681f40ee5c 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs  
							
							 
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8d06be35e0 
								
							 
						 
						
							
							
								
								activitypub: utils: add determine_explicit_mentions() and tests  
							
							 
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								651ce1c97b 
								
							 
						 
						
							
							
								
								Merge branch '491_full_mentions_in_user_bio' into 'develop'  
							
							 
							
							... 
							
							
							
							[#491 ] Made user bio preserve full nicknames (nick@host)
Closes  #491 
See merge request pleroma/pleroma!676  
							
						 
						
							2019-01-19 07:36:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								65bb9b2fba 
								
							 
						 
						
							
							
								
								[ #491 ] Made full nicknames be preserved in user links text only in Bio.  
							
							 
							
							
							
						 
						
							2019-01-18 09:30:16 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ae8a5942cf 
								
							 
						 
						
							
							
								
								Merge branch 'bad-copy-paste' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix bad link in likes collection
See merge request pleroma/pleroma!679  
							
						 
						
							2019-01-17 19:22:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								948fba6f76 
								
							 
						 
						
							
							
								
								Fix bad link in likes collection  
							
							 
							
							... 
							
							
							
							Don't copy and paste, mkay 
							
						 
						
							2019-01-17 18:21:43 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								849c83ed46 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2019-01-17 16:10:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6bc9a641ba 
								
							 
						 
						
							
							
								
								Default to disabled in the code in case the setting is absent from config.exs  
							
							 
							
							
							
						 
						
							2019-01-17 16:01:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8c368d42a2 
								
							 
						 
						
							
							
								
								Make attachment links configurable  
							
							 
							
							... 
							
							
							
							Thanks @href! 
							
						 
						
							2019-01-17 15:48:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								943324b661 
								
							 
						 
						
							
							
								
								MastoAPI: Don't break on missing users.  
							
							 
							
							
							
						 
						
							2019-01-16 15:13:09 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								17da432dbb 
								
							 
						 
						
							
							
								
								websub: improve error handling  
							
							 
							
							
							
						 
						
							2019-01-15 18:03:49 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								dc45ec62c2 
								
							 
						 
						
							
							
								
								[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.  
							
							 
							
							
							
						 
						
							2019-01-14 20:04:45 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								de1da7b3d1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/add-oembed-parser' into 'develop'  
							
							 
							
							... 
							
							
							
							Add OEmbed parser
See merge request pleroma/pleroma!661  
							
						 
						
							2019-01-14 07:28:04 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b8a77c5d70 
								
							 
						 
						
							
							
								
								Add OEmbed parser  
							
							 
							
							
							
						 
						
							2019-01-13 02:06:50 +02: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								9daf162461 
								
							 
						 
						
							
							
								
								Honour parameters on MastoAPI /favourites  
							
							 
							
							
							
						 
						
							2019-01-12 14:42:52 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								144b48da95 
								
							 
						 
						
							
							
								
								Add link headers to MastoAPI /favourites  
							
							 
							
							... 
							
							
							
							As documented at https://docs.joinmastodon.org/api/rest/favourites/  
							
						 
						
							2019-01-12 14:03:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b594a54d0c 
								
							 
						 
						
							
							
								
								unpin when deleting a status  
							
							 
							
							
							
						 
						
							2019-01-11 12:31:31 +07: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