From 303744f31e7afa03fc1c2510aae3458cc0294eb3 Mon Sep 17 00:00:00 2001
From: Jon Gilkison <jon.gilkison@gmail.com>
Date: Tue, 25 Apr 2017 23:37:26 +0700
Subject: [PATCH] Fix for attachment details pop up. Version bump.

---
 classes/tools/s3/ilab-media-s3-tool.php |  2 +-
 ilab-media-tools.php                    |  2 +-
 readme.txt                              | 16 +++++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/classes/tools/s3/ilab-media-s3-tool.php b/classes/tools/s3/ilab-media-s3-tool.php
index a984bce0..fcb7f0d0 100644
--- a/classes/tools/s3/ilab-media-s3-tool.php
+++ b/classes/tools/s3/ilab-media-s3-tool.php
@@ -184,7 +184,7 @@ private function hookupUI() {
                         if (attachTemplate) {
                             var txt = attachTemplate.text();
                             var idx = txt.indexOf('<div class="compat-meta">');
-                            txt = txt.slice(0, idx) + '<# if ( data.s3 ) { #><div><strong>Bucket:</strong> {{data.s3.bucket}}</div><div><strong>Path:</strong> {{data.s3.key}}</div><div><strong>Access:</strong> {{data.s3.privacy}}</div><# if ( data.s3.options ) { #><div><strong>S3 Cache-Control:</strong> {{data.s3.options.params.CacheControl}}</div><div><strong>S3 Expires:</strong> {{data.s3.options.params.Expires}}</div><# } #><div><a href="{{data.s3.url}}" target="_blank">Original S3 URL</a></div><# } #>' + txt.slice(idx);
+                            txt = txt.slice(0, idx) + '<# if ( data.s3 ) { #><div><strong>Bucket:</strong> {{data.s3.bucket}}</div><div><strong>Path:</strong> {{data.s3.key}}</div><div><strong>Access:</strong> {{data.s3.privacy}}</div><# if ( data.s3.options && data.s3.options.params ) { #><# if (data.s3.options.params.CacheControl) { #><div><strong>S3 Cache-Control:</strong> {{data.s3.options.params.CacheControl}}</div><# } #><# if (data.s3.options.params.Expires) { #><div><strong>S3 Expires:</strong> {{data.s3.options.params.Expires}}</div><# } #><# } #><div><a href="{{data.s3.url}}" target="_blank">Original S3 URL</a></div><# } #>' + txt.slice(idx);
                             attachTemplate.text(txt);
                         }
                     });
diff --git a/ilab-media-tools.php b/ilab-media-tools.php
index 7f9e95e2..0d4fe02d 100644
--- a/ilab-media-tools.php
+++ b/ilab-media-tools.php
@@ -4,7 +4,7 @@
 Plugin URI: http://interfacelab.com/media-tools
 Description: Automatically upload media to Amazon S3 and integrate with Imgix, a real-time image processing CDN.  Boosts site performance and simplifies workflows.
 Author: interfacelab
-Version: 1.4.1
+Version: 1.4.2
 Author URI: http://interfacelab.io
 */
 
diff --git a/readme.txt b/readme.txt
index 6b43f6bc..a8b31e1f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -6,7 +6,7 @@ Tested up to: 4.7.4
 License: GPLv3 or later
 Donate link: http://www2.jdrf.org/site/TR?fr_id=6912&pg=personal&px=11429802
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 
 Automatically upload media to Amazon S3 and integrate with Imgix, a real-time image processing CDN.  Boosts site
 performance and simplifies workflows.
@@ -99,6 +99,20 @@ No, I'm just one very enthusiastic customer.
 
 == Changelog ==
 
+= 1.4.2 =
+* Changed plugin name
+* Ability to import non-standard image types such as TIFF, Adobe Photoshop, and Adobe Illustrator (requires Imgix)
+* Ability to render PDF as images (requires Imgix)
+* Turn off auto-upload for non-image types
+* Specify specific MIME types to NOT upload to S3
+* Improved compatibility with Offload S3
+* Added ilab_s3_upload_params filter for the ability to specify custom S3 metadata for each upload
+* Ability to define custom ACL for uploads
+* S3 info displayed in Attachment Details pop up modal
+* S3 metabox added to Attachment edit pages, allowing you to edit the Cache-Control, Expires and ACL for the S3 upload
+* Fix for cropping images on S3
+* Other bug fixes.
+
 = 1.4.1 =
 * Changed plugin name
 * Ability to import non-standard image types such as TIFF, Adobe Photoshop, and Adobe Illustrator (requires Imgix)