Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2020-07-22 13:38:17 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Change deletes to preserve soft-deleted statuses in unresolved reports ( #11805 ) 
						
					 
				 
				2019-09-11 16:32:44 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Improved remote thread fetching ( #10106 ) 
						
					 
				 
				2019-02-28 15:22:21 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix performance of follow import ( #13836 ) 
						
					 
				 
				2020-06-09 10:26:58 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2020-06-09 10:39:20 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix web push subscriptions being deleted on rate limit or timeout ( #11826 ) 
						
					 
				 
				2019-09-13 19:15:47 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix domain hiding logic ( #7765 ) 
						
					 
				 
				2018-06-09 22:46:54 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix removing allowed domains being done synchronously ( #14302 ) 
						
					 
				 
				2020-07-15 21:08:19 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							authorize-follow-requests-after-unlocking ( #4658 ) 
						
					 
				 
				2017-08-26 12:40:03 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change local media attachments to perform heavy processing asynchronously ( #13210 ) 
						
					 
				 
				2020-03-08 23:56:18 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add conversations API ( #8832 ) 
						
					 
				 
				2018-10-07 23:44:58 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Default follows for new users ( #4871 ) 
						
					 
				 
				2017-09-10 09:58:38 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Move e-mail digest task to sidekiq, reduce workload, improve hint ( #6252 ) 
						
					 
				 
				2018-01-15 04:34:28 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Avoid race condition when streaming deleted statuses ( #10280 ) 
						
					 
				 
				2019-03-16 20:18:47 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Make domain block/silence/reject-media code more robust ( #13424 ) 
						
					 
				 
				2020-06-09 10:32:00 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Make domain block/silence/reject-media code more robust ( #13424 ) 
						
					 
				 
				2020-06-09 10:32:00 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2020-09-08 16:26:47 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Improved remote thread fetching ( #10106 ) 
						
					 
				 
				2019-02-28 15:22:21 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add option to overwrite imported data ( #9962 ) 
						
					 
				 
				2019-02-03 03:59:51 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Improve error handling on LinkCrawlWorker ( #5250 ) 
						
					 
				 
				2017-10-06 20:39:08 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Optimize the process of following someone ( #9220 ) 
						
					 
				 
				2018-11-08 21:05:42 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor feed manager ( #14761 ) 
						
					 
				 
				2020-09-08 03:41:16 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change move handler to carry blocks over ( #14144 ) 
						
					 
				 
				2020-07-01 13:51:15 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor feed manager ( #14761 ) 
						
					 
				 
				2020-09-08 03:41:16 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix background jobs not using locks like they are supposed to ( #13361 ) 
						
					 
				 
				2020-03-31 21:59:03 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add color extraction for audio thumbnails ( #14209 ) 
						
					 
				 
				2020-07-05 18:28:25 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change Redis#exists calls to Redis#exists? to avoid deprecation warning ( #14191 ) 
						
					 
				 
				2020-07-01 19:05:21 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change Redis#exists calls to Redis#exists? to avoid deprecation warning ( #14191 ) 
						
					 
				 
				2020-07-01 19:05:21 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix background jobs not using locks like they are supposed to ( #13361 ) 
						
					 
				 
				2020-03-31 21:59:03 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add E2EE API ( #13820 ) 
						
					 
				 
				2020-06-02 19:24:53 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add E2EE API ( #13820 ) 
						
					 
				 
				2020-06-02 19:24:53 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Lists ( #5703 ) 
						
					 
				 
				2017-11-18 00:16:48 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add customizable thumbnails for audio and video attachments ( #14145 ) 
						
					 
				 
				2020-06-29 13:56:55 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix RefollowWorker not keeping show_reblogs setting ( #12707 ) 
						
					 
				 
				2020-01-02 20:52:39 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix background jobs not using locks like they are supposed to ( #13361 ) 
						
					 
				 
				2020-03-31 21:59:03 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add soft delete for statuses for instant deletes through API ( #11623 ) 
						
					 
				 
				2019-08-22 21:55:56 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix background jobs not using locks like they are supposed to ( #13361 ) 
						
					 
				 
				2020-03-31 21:59:03 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Improved remote thread fetching ( #10106 ) 
						
					 
				 
				2019-02-28 15:22:21 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Improve background jobs params and error handling 
						
					 
				 
				2017-01-05 03:28:21 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix various issues with account migration ( #12301 ) 
						
					 
				 
				2019-11-07 09:05:07 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor feed manager ( #14761 ) 
						
					 
				 
				2020-09-08 03:41:16 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change Redis#exists calls to Redis#exists? to avoid deprecation warning ( #14191 ) 
						
					 
				 
				2020-07-01 19:05:21 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix background jobs not using locks like they are supposed to ( #13361 ) 
						
					 
				 
				2020-03-31 21:59:03 +02:00