Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							d1102cd635 
							
						 
					 
					
						
						
							
							Merge from sanmadjack:develop  
						
						
						
						
					 
					
						2019-06-14 13:46:55 +01:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							f078b283bd 
							
						 
					 
					
						
						
							
							pull a bunch of small fixes from  #659  
						
						
						
						
					 
					
						2019-06-14 13:16:58 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							5765978afd 
							
						 
					 
					
						
						
							
							Changed to prevent writing duplicate image tag IDs  
						
						
						
						
					 
					
						2019-06-14 12:52:58 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							edc05b2f72 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into develop  
						
						... 
						
						
						
						# Conflicts:
#	ext/cron_uploader/main.php 
						
						
					 
					
						2019-06-13 13:34:44 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							7c4356d788 
							
						 
					 
					
						
						
							
							Updated copyright notice  
						
						
						
						
					 
					
						2019-06-13 18:19:18 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							5c48a5c6ee 
							
						 
					 
					
						
						
							
							readme correction  
						
						
						
						
					 
					
						2019-06-13 18:19:09 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							6006a83229 
							
						 
					 
					
						
						
							
							Added <label> to extension name in extension manager so the name can also be clicked to enable/disable an extension  
						
						
						
						
					 
					
						2019-06-13 18:18:51 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							8cdab6623a 
							
						 
					 
					
						
						
							
							Changed clamp function to allow null values  
						
						
						
						
					 
					
						2019-06-13 18:17:38 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							68c3e5ea42 
							
						 
					 
					
						
						
							
							Changed cron upload so that an unrecognised file type results in an error instead of a success  
						
						
						
						
					 
					
						2019-06-13 18:17:16 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa0225652 
							
						 
					 
					
						
						
							
							Adjustments to transcoding to allow psd transcoding to actually work  
						
						... 
						
						
						
						Changed resize extension to run later in the extension stack
Little fixes 
						
						
					 
					
						2019-06-13 11:45:34 -05:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							1d1536b1ee 
							
						 
					 
					
						
						
							
							assert_options is deprecated for php7  
						
						
						
						
					 
					
						2019-06-13 16:57:58 +01:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							10d8b352c1 
							
						 
					 
					
						
						
							
							allow tags with apostrophes to be accelerated  
						
						
						
						
					 
					
						2019-06-13 16:57:23 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							3269d32378 
							
						 
					 
					
						
						
							
							Added transcode extension to allow admins to convert images to other types (for instance, converting PNG to more efficient lossless webps, not that I made this just so I could do that). It also allows uploading image formats that aren't compatible with the web, such as TIFF and PSD, by automatically transcoding them to a supported fele format.  
						
						
						
						
					 
					
						2019-06-12 17:54:06 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							a1512975b6 
							
						 
					 
					
						
						
							
							This should have been checked in with the header bytes change, provides the actual type detection  
						
						
						
						
					 
					
						2019-06-12 17:51:15 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							cb24ac69ab 
							
						 
					 
					
						
						
							
							Changes to cron upload:  
						
						... 
						
						
						
						Added transaction handling so that subsequent errors don't result in images that have already moved to the uploaded folder from being wiped from the database.
Changed output folders to use subfolders based on the timestamp of the current run. This is to prevent writing over files in the error folder that happen to have the same name and path, effectively losing the data.
Added additional error and information logging, and a final count of imported/merged/failed. 
						
						
					 
					
						2019-06-12 17:50:00 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							b27904a7e0 
							
						 
					 
					
						
						
							
							Changes to bulk actions, passing full ID arrays instead of chunked image arrays  
						
						... 
						
						
						
						Changed the bulk actions to have a separate identifier from the button name 
						
						
					 
					
						2019-06-12 17:46:24 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							97f60b3ea5 
							
						 
					 
					
						
						
							
							Better error handling for GD code  
						
						
						
						
					 
					
						2019-06-12 17:40:43 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							f9f4c3bd37 
							
						 
					 
					
						
						
							
							Updated copyright notice  
						
						
						
						
					 
					
						2019-06-12 17:36:36 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							b1909ffed6 
							
						 
					 
					
						
						
							
							readme correction  
						
						
						
						
					 
					
						2019-06-12 17:35:32 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							97abeb5254 
							
						 
					 
					
						
						
							
							Added option to detect file type based on header bytes  
						
						
						
						
					 
					
						2019-06-12 17:35:11 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							8f73b35fbb 
							
						 
					 
					
						
						
							
							Added OnTagTermParse to rating extension  
						
						... 
						
						
						
						Updated an install step to be pgsql compatible 
						
						
					 
					
						2019-06-11 09:59:06 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							8f3c20134f 
							
						 
					 
					
						
						
							
							Added <label> to extension name in extension manager so the name can also be clicked to enable/disable an extension  
						
						
						
						
					 
					
						2019-06-11 09:08:16 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							f2fb040a5b 
							
						 
					 
					
						
						
							
							Moved ImageResizeException to the core space so that the core space image resize code can use it  
						
						
						
						
					 
					
						2019-06-11 09:06:47 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							b31a916477 
							
						 
					 
					
						
						
							
							Changed clamp function to allow null values  
						
						
						
						
					 
					
						2019-06-11 09:05:54 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							e2d04ca58c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into develop  
						
						
						
						
					 
					
						2019-06-11 08:50:27 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9d68c8e079 
							
						 
					 
					
						
						
							
							Merge pull request  #2  from sanmadjack/custom  
						
						... 
						
						
						
						Custom 
						
						
					 
					
						2019-06-09 14:24:54 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							b7945b098e 
							
						 
					 
					
						
						
							
							Changed to prevent writing duplicate image tag IDs  
						
						
						
						
					 
					
						2019-06-09 14:18:25 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							4410baeb9c 
							
						 
					 
					
						
						
							
							Changed cron upload so that an unrecognised file type results in an error instead of a success  
						
						
						
						
					 
					
						2019-06-09 14:17:13 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							eb4292316d 
							
						 
					 
					
						
						
							
							Added webp upload and thumbnailing support  
						
						... 
						
						
						
						Bug fixes and consolidation of various thumbnail and resize functionality
Changed resize/rotate extensions to use replace image event
Added content-disposition header to image responses to provide a human-friendly filename when saving
Added more bulk thumbnail regeneration tools
Tweaks to bulk actions to correct totals when batching items 
						
						
					 
					
						2019-06-09 14:14:04 -05:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							e77f7de7f9 
							
						 
					 
					
						
						
							
							Fixes for tag / source history  
						
						
						
						
					 
					
						2019-06-09 08:32:01 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							49cb6f7233 
							
						 
					 
					
						
						
							
							Added thumb_scaling option for generating high-dpi thumbnails  
						
						
						
						
					 
					
						2019-06-06 14:12:13 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							8612a07a5a 
							
						 
					 
					
						
						
							
							cleanup  
						
						
						
						
					 
					
						2019-06-05 19:37:07 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Barbour 
							
						 
					 
					
						
						
						
						
							
						
						
							66df295ec1 
							
						 
					 
					
						
						
							
							Bulk action extension  
						
						
						
						
					 
					
						2019-06-05 18:16:15 -05:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fad31ed38d 
							
						 
					 
					
						
						
							
							Merge pull request  #655  from sanmadjack/develop  
						
						... 
						
						
						
						Enabled rating extension for pgsql 
						
						
					 
					
						2019-06-05 15:14:54 +01:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							8741529590 
							
						 
					 
					
						
						
							
							Enabled rating extension for pgsql  
						
						
						
						
					 
					
						2019-06-03 08:58:39 -05:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							abeb6299fc 
							
						 
					 
					
						
						
							
							Merge pull request  #654  from sanmadjack/develop  
						
						... 
						
						
						
						Cron upload changes 
						
						
					 
					
						2019-06-03 07:39:55 +01:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							aef455949b 
							
						 
					 
					
						
						
							
							Added escape to cron upload to stop the process when a transaction-breaking error occurs.  
						
						
						
						
					 
					
						2019-06-02 13:38:25 -05:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							38badf7e45 
							
						 
					 
					
						
						
							
							Changed cron import to output imported/failed files to subdirectories matching the imported file's original subdirectory  
						
						
						
						
					 
					
						2019-06-02 13:34:24 -05:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							e651da03cc 
							
						 
					 
					
						
						
							
							Changed path tag handling to merge path tags with filename tags  
						
						... 
						
						
						
						Added 0-9 to the filename tag regexp so that extensions like mp4 will be picked up as well. 
						
						
					 
					
						2019-06-02 13:27:24 -05:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a1297781d5 
							
						 
					 
					
						
						
							
							Merge pull request  #653  from sanmadjack/develop  
						
						... 
						
						
						
						Fixes for various issues 
						
						
					 
					
						2019-06-02 19:16:41 +01:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							5a2f893667 
							
						 
					 
					
						
						
							
							Changed cron upload new image tagging to work with tag event's requirement for tags to not be empty.  
						
						
						
						
					 
					
						2019-06-01 12:17:38 -05:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							3e2a0ea3b5 
							
						 
					 
					
						
						
							
							Brought cron upload tag handling inline with everything else  
						
						
						
						
					 
					
						2019-06-01 12:12:36 -05:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							e92ac10349 
							
						 
					 
					
						
						
							
							Removed unset line so it doesn't do it twice.  
						
						
						
						
					 
					
						2019-06-01 12:08:07 -05:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							63a69e4258 
							
						 
					 
					
						
						
							
							Change to correct issue with my change to prevent cron uploader from throwing warnings. Now using array_pop so that position in the array doesn't matter.  
						
						
						
						
					 
					
						2019-06-01 12:02:58 -05:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							99b51e65c1 
							
						 
					 
					
						
						
							
							Added array_unique to set_tags to prevent primary key violations when upload conflict is set to merge  
						
						
						
						
					 
					
						2019-06-01 11:39:03 -05:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							42b39f20d7 
							
						 
					 
					
						
						
							
							Updated config interface as well  
						
						
						
						
					 
					
						2019-06-01 10:50:53 -05:00 
						 
				 
			
				
					
						
							
							
								matthew 
							
						 
					 
					
						
						
						
						
							
						
						
							1eecf323f4 
							
						 
					 
					
						
						
							
							Changed set_int to accept a string, since it can accept shorthand strings like 1M. Casting it to an int was stripping out that information when settings would be submitted.  
						
						
						
						
					 
					
						2019-06-01 10:47:11 -05:00 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							23392b6b91 
							
						 
					 
					
						
						
							
							Removed a test line  
						
						
						
						
					 
					
						2019-06-01 10:07:01 -05:00 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							98bc7c7df1 
							
						 
					 
					
						
						
							
							Corrected issue preventing cron upload from generating key  
						
						
						
						
					 
					
						2019-06-01 10:04:16 -05:00 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							76bd6d4238 
							
						 
					 
					
						
						
							
							Fixed an issue when null wueries were passed to some themes  
						
						
						
						
					 
					
						2019-06-01 09:47:03 -05:00