David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								c08c971dd3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream  
							
							... 
							
							
							
							Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml 
							
						 
						
							2018-03-02 21:46:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f410afe59e 
								
							 
						 
						
							
							
								
								Ensure that boolean params in the API are parsed for truthiness ( #6575 )  
							
							... 
							
							
							
							Use Rails smart boolean cast to account for values such as "f",
"0", "false", etc. Previously, if a param was present in the request,
it would count as true. 
							
						 
						
							2018-03-01 02:47:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Surinna Curtis 
								
							 
						 
						
							
							
							
							
								
							
							
								02ae609d9a 
								
							 
						 
						
							
							
								
								Merge tootsuite/master at  ab48f2b239 
							
							
							
						 
						
							2017-11-16 01:21:16 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								74de5566d4 
								
							 
						 
						
							
							
								
								Filter searched toots to be consistent with blocking behaviors ( #5383 )  
							
							
							
						 
						
							2017-11-15 01:53:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								2706eef783 
								
							 
						 
						
							
							
								
								Raise search results count to 10 for test  
							
							... 
							
							
							
							reference: https://mastodon.xyz/users/lx/updates/278054  
							
						 
						
							2017-07-15 15:42:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9fff81f676 
								
							 
						 
						
							
							
								
								Fix   #3462  - Require authentication for search API ( #4155 )  
							
							... 
							
							
							
							This makes it consistent with /api/v1/accounts/search and
previous behaviour has been an oversight. 
							
						 
						
							2017-07-11 17:08:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								20e15ecfb3 
								
							 
						 
						
							
							
								
								Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl ( #4090 )  
							
							
							
						 
						
							2017-07-07 04:02:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								76f986d07b 
								
							 
						 
						
							
							
								
								Clean up for api/base controller ( #3629 )  
							
							... 
							
							
							
							* Move ApiController to Api/BaseController
* API controllers inherit from Api::BaseController
* Add coverage for various error cases in api/base controller 
							
						 
						
							2017-06-07 20:09:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								3d2927caa2 
								
							 
						 
						
							
							
								
								Refactor api/v1/search controller ( #3468 )  
							
							
							
						 
						
							2017-05-30 21:11:54 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3893f75a51 
								
							 
						 
						
							
							
								
								New API method: /api/v1/search  
							
							... 
							
							
							
							Returns accounts, statuses, hashtags arrays 
							
						 
						
							2017-03-22 02:32:27 +01:00