jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ecf33e39d
							
						
					 | 
					
						
						
							
							Merge branch 'video_thumb' of git://github.com/shish/shimmie2 into develop
						
						
						
						
						
						
					 | 
					
						2014-04-26 16:54:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							daee99c1bc
							
						
					 | 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.
						
						
						
						
						
						
					 | 
					
						2014-04-24 22:28:53 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fd655fc4e
							
						
					 | 
					
						
						
							
							Added conditional message for IE users to download plugin from Google for webm.
						
						
						
						
						
						
					 | 
					
						2014-04-18 18:47:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5d005710c
							
						
					 | 
					
						
						
							
							Fix indentation (spaces -> tabs)
						
						
						
						
						
						
					 | 
					
						2014-04-18 02:10:10 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f380f5d59
							
						
					 | 
					
						
						
							
							Video thumbs are working for webm files now.
						
						
						
						
						
						
					 | 
					
						2014-04-18 02:06:12 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							273d386d22
							
						
					 | 
					
						
						
							
							Working on thumbnail support for video files.
						
						
						
						
						
						
					 | 
					
						2014-04-18 01:37:27 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shish
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c9a4a3b86
							
						
					 | 
					
						
						
							
							A start on video thumbnailing; see #400
						
						
						
						
						
						
						
						Almost certainly not working yet; not tested, just committing so that
other people have something to work with and we aren't duplicating
effort 
						
						
					 | 
					
						2014-04-10 08:15:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shish
							
						 
					 | 
					
						
						
						
						
							
						
						
							f72bfbb050
							
						
					 | 
					
						
						
							
							fix indentation
						
						
						
						
						
						
					 | 
					
						2014-04-06 20:47:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shish
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8aa3327a1
							
						
					 | 
					
						
						
							
							A bunch of small changes from scrutinizer-ci; some tidying, some actual bug fixes
						
						
						
						
						
						
					 | 
					
						2014-03-30 13:26:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								velocity37
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9bacdf56d
							
						
					 | 
					
						
						
							
							Handle Video: Flash/HTML5 video player
						
						
						
						
						
						
						
						Requires getID3() and Jaris FLV Player 
						
						
					 | 
					
						2012-10-16 21:42:20 +01:00 | 
					
					
						
						
							
							
							
						
					 |