David Yip 
							
						 
					 
					
						
						
							
						
						dd28b94cf0 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into gs-master  
						
						 
						
						
						
						
					 
					
						2017-10-26 09:18:27 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								unarist 
							
						 
					 
					
						
						
							
						
						4f337c020a 
					 
					
						
						
							
							Fix Cocaine::ExitStatusError when upload small non-animated GIF ( #5489 )  
						
						 
						
						... 
						
						
						
						Looks like copied tempfile need to be flushed before further processing. This issue won't happen if the uploaded file has enough file size. 
						
						
					 
					
						2017-10-26 22:48:35 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DJ Sundog 
							
						 
					 
					
						
						
							
						
						85d5da86df 
					 
					
						
						
							
							raise Mastodon::ValidationError if audio file duration is over 60 secs  
						
						 
						
						
						
						
					 
					
						2017-10-07 16:14:34 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DJ Sundog 
							
						 
					 
					
						
						
							
						
						e10cff8226 
					 
					
						
						
							
							update indentation  
						
						 
						
						
						
						
					 
					
						2017-10-07 13:55:11 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DJ Sundog 
							
						 
					 
					
						
						
							
						
						96ba3482b9 
					 
					
						
						
							
							adding support for audio uploads, transcoded to mp4 videos  
						
						 
						
						
						
						
					 
					
						2017-10-07 19:54:10 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen 
							
						 
					 
					
						
						
							
						
						2e4afccd9d 
					 
					
						
						
							
							Fix   #2108  - Fix gif uploads ( #2171 )  
						
						 
						
						... 
						
						
						
						* Fix  #2108  - Fix gif uploads
Add specs for media attachment gifv conversion
* Add ffmpeg to travis
* Make travis install ffmpeg, not libav
* Switch travis to trusty 
						
						
					 
					
						2017-04-19 23:21:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						03a857f59a 
					 
					
						
						
							
							Use more widely supported MP4 format for gifv's  
						
						 
						
						
						
						
					 
					
						2017-03-06 00:30:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						85fce04d1b 
					 
					
						
						
							
							Detect videos with no sound, handle them like gifv  
						
						 
						
						
						
						
					 
					
						2017-03-05 22:55:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						caf5b8e975 
					 
					
						
						
							
							Fix   #431  - convert gif to webm during upload. Web UI treats them like it did  
						
						 
						
						... 
						
						
						
						before. In the API, attachments now can be either image, video or gifv. Gifv
is to be treated like images in terms of behaviour, but are videos by file
type. 
						
						
					 
					
						2017-03-04 23:02:24 +01:00