jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							024e7eac8d
							
						
					 | 
					
						
						
							
							Fix underling.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 17:52:31 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b707081b33
							
						
					 | 
					
						
						
							
							Cleaning up the README.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 17:47:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							c37ba07de0
							
						
					 | 
					
						
						
							
							Convert the README.txt file into Markdown format.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 17:43:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1d123c960
							
						
					 | 
					
						
						
							
							Add more escaping to the shell command for ffmpeg.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 17:09:18 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							26e8db1fdc
							
						
					 | 
					
						
						
							
							Add the Travis-CI build status icon image to the Readme. ;)
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 17:01:01 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e4b53c3f4
							
						
					 | 
					
						
						
							
							Merge branch 'code_removal' of github.com:jgen/shimmie2 into develop
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 16:55:11 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ecf33e39d
							
						
					 | 
					
						
						
							
							Merge branch 'video_thumb' of git://github.com/shish/shimmie2 into develop
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 16:54:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							86b6d12819
							
						
					 | 
					
						
						
							
							Merge branch 'linting' of github.com:jgen/shimmie2 into code_removal
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 16:50:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shish
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9d8ae7f5b
							
						
					 | 
					
						
						
							
							Merge pull request #413 from jgen/linting
						
						
						
						
						
						
						
						Lots o' Linting 
						
						
							
 v2.5.0
						
					 | 
					
						2014-04-26 12:00:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							95ba85ee43
							
						
					 | 
					
						
						
							
							This js file relies on functions defined in 'shimmie.js' which is all globed together when rendering a page. Adding an ignore line to scrutinizer to prevent false-positives.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 05:32:15 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e9e5ca2be
							
						
					 | 
					
						
						
							
							Fixing/adding/cleaning up the PHP Doc comments.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 05:01:49 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8dd045586
							
						
					 | 
					
						
						
							
							Combine these if statements into one to reduce the cyclomatic complexity.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 03:56:06 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							42407116a8
							
						
					 | 
					
						
						
							
							Removing this file.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 03:33:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							013222e4ee
							
						
					 | 
					
						
						
							
							Code Removal: PHP has had JSON support directly baked into the language since 5.2.0 - there is no need to rely on an external library from 2006 for json support.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 03:31:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							efb5038b20
							
						
					 | 
					
						
						
							
							This file no longer exists.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 03:15:44 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							298344048c
							
						
					 | 
					
						
						
							
							Make these functions public to prevent scrutinizer from complaining.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-26 00:27:16 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6b1d514d1
							
						
					 | 
					
						
						
							
							Some more type hinting via the comments.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 23:22:34 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							24371d8c34
							
						
					 | 
					
						
						
							
							Fix the PHP Doc comments.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 23:19:18 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ca3865a1c
							
						
					 | 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines. (Also see: https://stackoverflow.com/questions/4410704/why-would-one-omit-the-close-tag )
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 22:54:51 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f60467848
							
						
					 | 
					
						
						
							
							This code doesn't seem to actually be used by anything at all.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 22:33:57 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f2be45f68
							
						
					 | 
					
						
						
							
							Fix the PHPDoc comments on these.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 21:42:52 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e899710d7
							
						
					 | 
					
						
						
							
							Stop scrutinizer from complaining here.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 17:40:42 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							c85630198f
							
						
					 | 
					
						
						
							
							These variables where never defined depending on the execution path.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 17:40:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f685ca227
							
						
					 | 
					
						
						
							
							Use the method from core/util to parse the bool from the DB instead.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 17:39:46 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a1197256a
							
						
					 | 
					
						
						
							
							Need to pull in the global $page variable for this method.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 17:39:06 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e15c5e47a
							
						
					 | 
					
						
						
							
							Explicitly declare this class variable
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 17:38:25 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							bcd3f991de
							
						
					 | 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 17:34:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4e6c0b743
							
						
					 | 
					
						
						
							
							Explicitly check if we can actually find the image by Id.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 16:08:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b5fd955b7
							
						
					 | 
					
						
						
							
							New exception type.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 16:07:30 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							9acf6c7f19
							
						
					 | 
					
						
						
							
							Rename these class functions to prevent warnings from scrutinizer.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 15:57:23 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							141ec53236
							
						
					 | 
					
						
						
							
							Rename these class functions to prevent warnings from scrutinizer.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 15:55:31 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							478eb3a4cc
							
						
					 | 
					
						
						
							
							Linting: Check for null return value, and throw an exception if null.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 15:39:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ef68b15f9
							
						
					 | 
					
						
						
							
							Fix indentation.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 15:38:15 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							6724f2b75a
							
						
					 | 
					
						
						
							
							Make these functions public to prevent scrutinizer from complaining.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 14:17:44 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcadfc395a
							
						
					 | 
					
						
						
							
							Move this code back down.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-25 14:14:22 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7faefc5e0
							
						
					 | 
					
						
						
							
							Spelling.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 22:35:01 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b241390fa4
							
						
					 | 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 22:34:45 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							50686ac61e
							
						
					 | 
					
						
						
							
							More linting, fix PHPDoc style.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 22:29:29 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							daee99c1bc
							
						
					 | 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 22:28:53 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							860af25550
							
						
					 | 
					
						
						
							
							Need to pull in the global $user variable.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 22:22:45 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ec5a7ce52
							
						
					 | 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 22:22:16 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							780d5f8709
							
						
					 | 
					
						
						
							
							More linting. Explicitly declare these class variables, as well as comment out dead code.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 22:13:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e4ae229ef
							
						
					 | 
					
						
						
							
							Explicitly declare this class variable
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 19:13:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3077d5bcd
							
						
					 | 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 19:13:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							2706f72ce4
							
						
					 | 
					
						
						
							
							Update and fix the PHPDoc comments.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 19:08:23 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cc31df737
							
						
					 | 
					
						
						
							
							Update the comments to PHPDoc style guidelines.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 19:02:43 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab3f9850e4
							
						
					 | 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 19:01:47 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							286e75bef0
							
						
					 | 
					
						
						
							
							Scrutinizer complains that these functions aren't defined, yet they really are.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 18:45:54 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							709366b70c
							
						
					 | 
					
						
						
							
							Explicitly declare these class variables.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 18:44:46 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jgen
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b90331f02
							
						
					 | 
					
						
						
							
							Add missing semi-colon.
						
						
						
						
						
						
							
						
					 | 
					
						2014-04-24 16:56:04 -04:00 | 
					
					
						
						
							
							
							
						
					 |