Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							bdbf95f2fa 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/shish/shimmie2  into develop  
						
						
						
						
							
						
					 
					
						2015-02-08 04:28:03 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							f92f286fa0 
							
						 
					 
					
						
						
							
							remove all reports from user  
						
						
						
						
							
						
					 
					
						2015-02-08 04:27:54 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							610b144fb2 
							
						 
					 
					
						
						
							
							minor CSS tweak  
						
						
						
						
							
						
					 
					
						2015-02-07 22:29:07 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							1c50616cdb 
							
						 
					 
					
						
						
							
							Merge pull request  #479  from jgen/develop  
						
						... 
						
						
						
						Change generated links to be aware of HTTPS. 
						
						
							
						
					 
					
						2015-02-02 08:14:41 -08:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							8e3fc1da9f 
							
						 
					 
					
						
						
							
							Change generated links to be aware of HTTPS.  
						
						
						
						
							
						
					 
					
						2015-02-02 00:13:05 -08:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							d523781481 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/shish/shimmie2  into develop  
						
						
						
						
							
						
					 
					
						2015-01-30 03:54:31 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							52dc36cfa6 
							
						 
					 
					
						
						
							
							str_getcsv rather than explode, for handling quotes  
						
						
						
						
							
						
					 
					
						2015-01-30 03:53:58 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							99be9c2fdb 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
							
						
					 
					
						2015-01-25 23:00:07 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							09d03d9036 
							
						 
					 
					
						
						
							
							allow dashes and underscores in static files, for apple-touch-icon  
						
						
						
						
							
						
					 
					
						2015-01-25 22:58:25 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							86716082e1 
							
						 
					 
					
						
						
							
							32x32 favicon  
						
						
						
						
							
						
					 
					
						2015-01-25 22:57:49 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							0d2d7eedd7 
							
						 
					 
					
						
						
							
							minor opt-in class to style  
						
						
						
						
							
						
					 
					
						2015-01-25 06:55:37 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							eae385f4c0 
							
						 
					 
					
						
						
							
							bump  
						
						
						
						
							
						
					 
					
						2015-01-24 17:11:25 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							cbbc0bab26 
							
						 
					 
					
						
						
							
							version bump  
						
						
						
						
							
 
						
					 
					
						2015-01-24 17:10:23 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							8eee2c0c92 
							
						 
					 
					
						
						
							
							logstash logger  
						
						
						
						
							
						
					 
					
						2015-01-24 16:57:28 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							67628816a4 
							
						 
					 
					
						
						
							
							Finally commit ext for purging varnish on-demand  
						
						
						
						
							
						
					 
					
						2015-01-24 16:54:18 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							b47e4aacb1 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/shish/shimmie2  into develop  
						
						
						
						
							
						
					 
					
						2015-01-24 16:44:33 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							edde7848b8 
							
						 
					 
					
						
						
							
							add mp3 to thumbless filetypes, see  #454  
						
						
						
						
							
						
					 
					
						2015-01-24 16:44:27 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							67fc50e6c3 
							
						 
					 
					
						
						
							
							Merge pull request  #475  from Diftraku/ouroboros_api  
						
						... 
						
						
						
						Fix duplicate handling 
						
						
							
						
					 
					
						2015-01-24 08:41:06 -08:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							8dc27c6b97 
							
						 
					 
					
						
						
							
							home page mobile tweaks  
						
						
						
						
							
						
					 
					
						2015-01-08 23:31:24 +00:00 
						 
				 
			
				
					
						
							
							
								Diftraku 
							
						 
					 
					
						
						
						
						
							
						
						
							3af95b5ebe 
							
						 
					 
					
						
						
							
							Fix duplicate handling  
						
						... 
						
						
						
						Now with 17% less fat:
* Moved validation logic into OuroborosPost for sanity
* Added sanity checks for OuroborosPost values
* Changed defaults to be more sane (mainly tags)
* OuroborosPost now accepts an MD5 hash along the metadata (like it
should!)
* Fixed dupe handling logic 
						
						
							
						
					 
					
						2015-01-05 13:47:53 +02:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							92bc8b0709 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/shish/shimmie2  into develop  
						
						
						
						
							
						
					 
					
						2014-12-31 13:16:24 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							217559dc22 
							
						 
					 
					
						
						
							
							set statement_timeout for postgres  
						
						
						
						
							
						
					 
					
						2014-12-31 13:16:00 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							1cb0f13820 
							
						 
					 
					
						
						
							
							Merge pull request  #471  from ElementAB/develop  
						
						... 
						
						
						
						Fixed information box link generation 
						
						
							
						
					 
					
						2014-12-29 12:35:33 +00:00 
						 
				 
			
				
					
						
							
							
								ElementAB 
							
						 
					 
					
						
						
						
						
							
						
						
							b555fab819 
							
						 
					 
					
						
						
							
							Fixed information box link generation  
						
						... 
						
						
						
						Fixed issue where the information box would generate an incorrect link for the image source if the source was given as https:// instead of http://. 
						
						
							
						
					 
					
						2014-12-25 01:38:51 -06:00 
						 
				 
			
				
					
						
							
							
								ElementAB 
							
						 
					 
					
						
						
						
						
							
						
						
							3d17310581 
							
						 
					 
					
						
						
							
							Fixed information box link generation  
						
						... 
						
						
						
						Fixed issue where the information box would generate an incorrect link for the image source if the source was given as https:// instead of http://. 
						
						
							
						
					 
					
						2014-12-25 01:36:18 -06:00 
						 
				 
			
				
					
						
							
							
								ElementAB 
							
						 
					 
					
						
						
						
						
							
						
						
							9ee2250e63 
							
						 
					 
					
						
						
							
							Fixed information box link generation  
						
						... 
						
						
						
						Fixed issue where the information box would generate an incorrect link for the image source if the source was given as https:// instead of http://. 
						
						
							
						
					 
					
						2014-12-24 12:34:32 -06:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							0fcfa49e75 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/shish/shimmie2  into develop  
						
						
						
						
							
						
					 
					
						2014-12-18 14:38:37 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							be4ae9da32 
							
						 
					 
					
						
						
							
							fix missing global (how did this pass tests? o.o)  
						
						
						
						
							
						
					 
					
						2014-12-18 14:38:22 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							caa2691bb9 
							
						 
					 
					
						
						
							
							Merge pull request  #468  from jgen/develop  
						
						... 
						
						
						
						Allow Shimmie to work with older versions of FFmpeg 
						
						
							
						
					 
					
						2014-12-17 13:44:25 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							7bcf2fc29e 
							
						 
					 
					
						
						
							
							Merge pull request  #465  from shish/min_space_config  
						
						... 
						
						
						
						Turn MIN_FREE_SPACE into a userspace config option 
						
						
							
						
					 
					
						2014-12-17 13:41:55 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							c0279565f4 
							
						 
					 
					
						
						
							
							Merge pull request  #462  from shish/bypass_comment_checks  
						
						... 
						
						
						
						Allow admins to bypass comment checks (rate limit etc) 
						
						
							
						
					 
					
						2014-12-17 13:40:06 +00:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							d878526487 
							
						 
					 
					
						
						
							
							Button should say "Regenerate Thumbnail" for clarity.  
						
						
						
						
							
						
					 
					
						2014-12-14 16:07:00 -08:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							95b94bd115 
							
						 
					 
					
						
						
							
							Some minor linting.  
						
						
						
						
							
						
					 
					
						2014-12-14 16:06:31 -08:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							433d67453c 
							
						 
					 
					
						
						
							
							This fixes issue  #466 . You can now optionally generate thumbnails for videos with the newer versions of FFmpeg that take into account the aspect ratio.  
						
						
						
						
							
						
					 
					
						2014-12-14 15:22:44 -08:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							5012b15ce9 
							
						 
					 
					
						
						
							
							Comment as to why the default is to ignore the aspect ratio.  
						
						
						
						
							
						
					 
					
						2014-12-14 15:20:47 -08:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							2ff036d250 
							
						 
					 
					
						
						
							
							Remove unused variables.  
						
						
						
						
							
						
					 
					
						2014-12-14 15:19:59 -08:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							02efa180de 
							
						 
					 
					
						
						
							
							Add a default option to ignore aspect ratio when creating a thumbnail with FFmpeg.  
						
						
						
						
							
						
					 
					
						2014-12-13 16:54:21 -08:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							e1a7986239 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2014-12-13 01:52:34 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							b71c96a130 
							
						 
					 
					
						
						
							
							Merge pull request  #467  from terokorp/hotfix/ratingsearchfix  
						
						... 
						
						
						
						Fixing "rating=safe" search bug 
						
						
							
						
					 
					
						2014-12-13 01:51:08 +00:00 
						 
				 
			
				
					
						
							
							
								Thasan 
							
						 
					 
					
						
						
						
						
							
						
						
							f2fc69cef4 
							
						 
					 
					
						
						
							
							Fixing "rating=safe" search bug  
						
						
						
						
							
						
					 
					
						2014-12-13 03:23:44 +02:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							40734ef711 
							
						 
					 
					
						
						
							
							turn MIN_FREE_SPACE into a userspace config option  
						
						
						
						
							
						
					 
					
						2014-12-07 13:54:47 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							9abcadffb6 
							
						 
					 
					
						
						
							
							throw Ex() -> throw new Ex();  
						
						
						
						
							
						
					 
					
						2014-12-07 13:20:36 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							316f7ff858 
							
						 
					 
					
						
						
							
							Give a better error if User::class has been screwed up somehow  
						
						
						
						
							
						
					 
					
						2014-12-07 03:44:17 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							88f1df9ca6 
							
						 
					 
					
						
						
							
							HIPHOP is no longer supported (it's HHVM now, and HHVM supports PDO params anyway)  
						
						
						
						
							
						
					 
					
						2014-12-07 01:10:12 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							5d099c06f9 
							
						 
					 
					
						
						
							
							remove references to unused cache values  
						
						
						
						
							
						
					 
					
						2014-12-06 23:51:58 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							5ab8f9e5e2 
							
						 
					 
					
						
						
							
							log sets and deletes in CACHE_DEBUG mode  
						
						
						
						
							
						
					 
					
						2014-12-06 23:50:56 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							4d6e6ade1c 
							
						 
					 
					
						
						
							
							version bump  
						
						
						
						
							
						
					 
					
						2014-12-06 23:48:03 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							b3931dd403 
							
						 
					 
					
						
						
							
							version bump  
						
						
						
						
							
 
						
					 
					
						2014-12-06 23:47:17 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							1bf3fba756 
							
						 
					 
					
						
						
							
							Merge branch 'develop'  
						
						
						
						
							
						
					 
					
						2014-12-06 23:46:14 +00:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							8c1eb60367 
							
						 
					 
					
						
						
							
							Remove twitter_soc; any twitter ext will need to be different,  fixes   #395  
						
						
						
						
							
						
					 
					
						2014-12-01 14:16:53 +00:00