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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								34d59e4008 
								
							 
						 
						
							
							
								
								[ #502 ] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test.  
							
							
							
						 
						
							2019-01-22 17:12:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								762fafe738 
								
							 
						 
						
							
							
								
								Fix buggy test.  
							
							
							
						 
						
							2019-01-21 17:54:11 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								789a9843da 
								
							 
						 
						
							
							
								
								[ #530 ] Fixed test.  
							
							
							
						 
						
							2019-01-21 14:30:01 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5803672ae5 
								
							 
						 
						
							
							
								
								Merge branch '116-send-delete-event' into 'develop'  
							
							... 
							
							
							
							Send delete event over Mastodon streaming api
Closes  #116 
See merge request pleroma/pleroma!688  
							
						 
						
							2019-01-20 23:06:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cf1f35a93a 
								
							 
						 
						
							
							
								
								Send delete event over Mastodon streaming api  
							
							... 
							
							
							
							Closes  #116  
						
							2019-01-20 13:00:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								501fba33d6 
								
							 
						 
						
							
							
								
								Merge branch 'add-custom-emoji-test' into 'develop'  
							
							... 
							
							
							
							Add a test to ensure #39  is fixed.
See merge request pleroma/pleroma!687  
							
						 
						
							2019-01-20 10:58:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								be0fb5dec4 
								
							 
						 
						
							
							
								
								Add a test to ensure  #39  is fixed.  
							
							
							
						 
						
							2019-01-20 11:48:53 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								cf3099231d 
								
							 
						 
						
							
							
								
								test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility  
							
							
							
						 
						
							2019-01-20 02:28:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								21ac35fcc0 
								
							 
						 
						
							
							
								
								tests: add tests for DM sanitizer  
							
							
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								31517bec12 
								
							 
						 
						
							
							
								
								test: add regression test for to/cc clobbering  
							
							
							
						 
						
							2019-01-18 22:32:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ed8f55ab8e 
								
							 
						 
						
							
							
								
								[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).  
							
							
							
						 
						
							2019-01-18 10:35:45 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								954dc4a4ad 
								
							 
						 
						
							
							
								
								[ #502 ] Fixed user_count in /api/v1/instance to include only active local users.  
							
							
							
						 
						
							2019-01-17 19:16:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2bfae25a1f 
								
							 
						 
						
							
							
								
								[ #491 ] Made user bio preserve full nicknames (nick@host).  
							
							
							
						 
						
							2019-01-17 18:03:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								943324b661 
								
							 
						 
						
							
							
								
								MastoAPI: Don't break on missing users.  
							
							
							
						 
						
							2019-01-16 15:13:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								608cc65d43 
								
							 
						 
						
							
							
								
								Merge branch 'feature/improve-microformats' into 'develop'  
							
							... 
							
							
							
							improve microformats support
See merge request pleroma/pleroma!672  
							
						 
						
							2019-01-16 09:06:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								da4b670451 
								
							 
						 
						
							
							
								
								Merge branch '518_instance_stats_fix' into 'develop'  
							
							... 
							
							
							
							[#518 ] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers
Closes  #518 
See merge request pleroma/pleroma!673  
							
						 
						
							2019-01-16 08:59:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								90433b988e 
								
							 
						 
						
							
							
								
								[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.  
							
							
							
						 
						
							2019-01-16 11:07:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								85a5be6220 
								
							 
						 
						
							
							
								
								tests: fixup  
							
							
							
						 
						
							2019-01-16 04:09:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5b8f9ff8c1 
								
							 
						 
						
							
							
								
								[ #477 ] User search tests. Normalized search rank in User.search.  
							
							
							
						 
						
							2019-01-15 13:05:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								fc965f982c 
								
							 
						 
						
							
							
								
								[ #477 ] Added FTS index for users. Fixed failing test.  
							
							
							
						 
						
							2019-01-15 12:04:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9fcdca1bdc 
								
							 
						 
						
							
							
								
								Upload: Fix uploading with a : in the filename  
							
							
							
						 
						
							2019-01-15 07:57:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e3eb75bd23 
								
							 
						 
						
							
							
								
								Upload: Fix uploading with a ? in the filename  
							
							
							
						 
						
							2019-01-15 07:40:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f20bfc9ea5 
								
							 
						 
						
							
							
								
								Merge branch 'media-url-escape' into 'develop'  
							
							... 
							
							
							
							URI escape file upload URLs
See merge request pleroma/pleroma!665  
							
						 
						
							2019-01-14 18:52:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shadowfacts 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dcbe5bd58c 
								
							 
						 
						
							
							
								
								Add attachment escaping test  
							
							
							
						 
						
							2019-01-14 13:29:38 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								98d9ae0718 
								
							 
						 
						
							
							
								
								Add test for mastodon API /favourites endpoint  
							
							
							
						 
						
							2019-01-13 15:17:47 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								728587fdaa 
								
							 
						 
						
							
							
								
								typo  
							
							
							
						 
						
							2019-01-11 12:47:44 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								1f851a0723 
								
							 
						 
						
							
							
								
								Add Twitter Card parser  
							
							
							
						 
						
							2019-01-10 18:09:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								11d08c6226 
								
							 
						 
						
							
							
								
								Merge branch 'twapi-follower-pagination' into 'develop'  
							
							... 
							
							
							
							Twapi follower pagination
See merge request pleroma/pleroma!648  
							
						 
						
							2019-01-10 18:03:32 +00:00