Merge branch 'develop'

.distignore

@@ -1,9 +1,11 @@
+# Directories
 /.github
 /.git
 /.wordpress-org
 /node_modules
 /tasks
 
+# Files
 .DS_Store
 .eslintrc.json
 .distignore
@@ -14,6 +16,7 @@ CONTRIBUTING.md
 CREDITS.md
 Gruntfile.js
 LICENSE
-package.json
-package-lock.json
 README.md
+composer.json
+package-lock.json
+package.json

CHANGELOG.md

@@ -2,56 +2,67 @@
 
 All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
 
-## 4.3.0 - 2019-11-14
-- Added support for Media Library upload process change introduced in WordPress 5.3
-- Offload "original_image" file introduced in WordPress 5.3
-- Fix issue with special characters in filenames with url encoding
-- Fix issue with media regeneration via WP CLI
+## [Unreleased] - TBD
+
+## [4.3.1] - 2020-02-12
+### Fixed
+- Restore visual indicator of upload progress to Azure Blob Storage and account for `original_image` in count (props [@rickalee](https://github.com/rickalee), [@moraleida](https://github.com/moraleida) via [#110](https://github.com/10up/windows-azure-storage/pull/110), [#109](https://github.com/10up/windows-azure-storage/pull/109)).
+- Ensure PDF thumbnails are offloaded with JPEG mimetype instead of PDF
+- Normalize file paths on Windows Server
+
+## [4.3.0] - 2019-11-18
+### Added
+- Support for Media Library upload process change introduced in WordPress 5.3.
+- Offload `original_image` file introduced in WordPress 5.3.
+
+### Fixed
+- Issue with special characters in filenames with url encoding.
+- Issue with media regeneration via WP CLI.
 
 ## [4.2.0] - 2018-05-04
 ### Added
-- Ability to setup Azure settings using constants in wp-config.php file
+- Ability to setup Azure settings using constants in `wp-config.php`.
 
 ### Fixed
-- Images uploading issue in the multisite environment, now it doesn't strip "sites/{id}" from filename
-- srcset issue for images uploaded before 4.2.0 version
-- Issue with special characters in filenames with url encoding
+- Images uploading issue in the multisite environment, now it doesn't strip `sites/{id}` from filename.
+- `srcset` issue for images uploaded before 4.2.0 version.
+- Issue with special characters in filenames with url encoding.
 
 ## [4.1.1] - 2018-01-31
 ### Changed
-- Updated authors list
+- Updated authors list.
 
 ### Removed
-- Build tools from the plugin repository
+- Build tools from the plugin repository.
 
 ## [4.1.0] - 2017-11-22
 ### Added
-- Error message when SimpleXML library is not found
-- Ability to enter Cache-Control property
+- Error message when SimpleXML library is not found.
+- Ability to enter Cache-Control property.
 
 ### Changed
-- Renamed plugin to be Microsoft Azure Storage for WordPress
+- Renamed plugin to be Microsoft Azure Storage for WordPress.
 
 ### Fixed
-- Trailing slash issue which led to double slashes in URLs
-- Minor warnings
+- Trailing slash issue which led to double slashes in URLs.
+- Minor warnings.
 
 ## [4.0.3] - 2017-10-19
 ### Added
-- Added POT file and loaded text domain
+- Added POT file and loaded text domain.
 
 ### Fixed
-- Uploading issue when year/month based folders are not used
-- CNAME issue in the srcset attribute when yar/month based folders are not used
+- Uploading issue when year/month based folders are not used.
+- CNAME issue in the srcset attribute when yar/month based folders are not used.
 
 ## [4.0.2] - 2017-03-02
 ### Fixed
 - Bug fix for 0-byte uploads.
 
 ## [4.0.1] - 2017-01-03
 ### Fixed
-- Blob name while media file
-- Show admin notice if can't access files directly
+- Blob name while media file.
+- Show admin notice if can't access files directly.
 
 ## [4.0.0] - 2016-11-10
 ### Added
@@ -78,13 +89,13 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [3.0.1] - 2016-03-01
 ### Fixed
-- Upload nonce checks
-- Media: fix the AYS checks on browse
+- Upload nonce checks.
+- Media: fix the AYS checks on browse.
 
 ## [3.0.0] - 2016-02-03
 ### Added
 - L10N/I18N: Round 1 of preparing strings for translation.
-- `srcset` to images added through the Media Library when Azure is the default media handler. (Props @patricknami).
+- `srcset` to images added through the Media Library when Azure is the default media handler. (Props [@patrickebates](https://github.com/patrickebates)).
 
 ### Changed
 - UI: Editor button more closely matches the WordPress Admin UI.
@@ -109,49 +120,59 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [2.0.0] - 2014-07-03
 ### Changed
-- Updated to use [Microsoft Azure SDK for PHP](https://github.com/WindowsAzure/azure-sdk-for-php)
+- Updated to use [Microsoft Azure SDK for PHP](https://github.com/WindowsAzure/azure-sdk-for-php).
 
 ### Fixed
-- Compatibility with WordPress 3.4.1
+- Compatibility with WordPress 3.4.1.
 
-## [1.9] - 2012-01-06
+## [1.9.0] - 2012-01-06
 ### Fixed
-- Case sensitivity error in file names on Linux
+- Case sensitivity error in file names on Linux.
 
-## [1.8] - 2012-01-06
+## [1.8.0] - 2012-01-06
 ### Fixed
-- Bug in generating blob storage URL when using Microsoft Azure Storage emulator
+- Bug in generating blob storage URL when using Microsoft Azure Storage emulator.
 
-## [1.7] - 2012-01-05
+## [1.7.0] - 2012-01-05
 ### Added
-- Support to upload video files to blob storage
+- Support to upload video files to blob storage.
 
-## [1.6] - 2012-01-05
+## [1.6.0] - 2012-01-05
 
-## [1.5] - 2012-01-04
+## [1.5.0] - 2012-01-04
 ### Added
 - Included Microsoft Azure SDK for PHP v4.1.0 with the plugin. Now setting mime-type for uploaded file to blob storage.
 
-## [1.4] - 2011-08-26
+## [1.4.0] - 2011-08-26
 ### Added
 - Included Microsoft Azure SDK for PHP v4.0.2 with the plugin.
 
-## [1.3] - 2011-08-16
+## [1.3.0] - 2011-08-16
 ### Added
-- Included Microsoft Azure SDK for PHP v4.0.1 with the plugin, so no need to install the SDK separetely. Also fixed thumbnail handling issue while uploading files when some specific theme is enabled.
+- Included Microsoft Azure SDK for PHP v4.0.1 with the plugin, so no need to install the SDK separetely.
+
+### Fixed
+- Thumbnail handling issue while uploading files when some specific theme is enabled.
 
-## [1.2] - 2011-06-03
+## [1.2.0] - 2011-06-03
 ### Added
-- Compatibility with Microsoft Azure SDK for PHP v3.0.0. It also fixes issue with deleting media files when thumbnails are associated.
+- Compatibility with Microsoft Azure SDK for PHP v3.0.0.
+
+### Fixed
+- Issue with deleting media files when thumbnails are associated.
 
-## [1.1] - 2011-03-03
+## [1.1.0] - 2011-03-03
 ### Added
-- Compatibility with Microsoft Azure SDK for PHP v2.1.0 and WordPress 3.1
+- Compatibility with Microsoft Azure SDK for PHP v2.1.0 and WordPress 3.1.
 
-## [1.0] - 2010-05-20
-- First release of Microsoft Azure Storage plugin for WordPress
+## [1.0.0] - 2010-05-20
+- First release of Microsoft Azure Storage plugin for WordPress.
 
-[4.1.1]: https://plugins.trac.wordpress.org/changeset/1812783/windows-azure-storage
+[Unreleased]: https://github.com/10up/windows-azure-storage/compare/4.3.0...master
+[4.3.1]: https://github.com/10up/windows-azure-storage/compare/4.3.0...4.3.1
+[4.3.0]: https://github.com/10up/windows-azure-storage/compare/013bb82...4.3.0
+[4.2.0]: https://github.com/10up/windows-azure-storage/compare/69fb174...013bb82
+[4.1.1]: https://github.com/10up/windows-azure-storage/compare/4.1.0...69fb174
 [4.1.0]: https://github.com/10up/windows-azure-storage/compare/4.0.3...4.1.0
 [4.0.3]: https://github.com/10up/windows-azure-storage/releases/tag/4.0.3
 [4.0.2]: https://plugins.trac.wordpress.org/changeset/1606680/windows-azure-storage
@@ -162,13 +183,13 @@ All notable changes to this project will be documented in this file, per [the Ke
 [2.2.0]: https://github.com/10up/windows-azure-storage/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/10up/windows-azure-storage/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/10up/windows-azure-storage/releases/tag/2.0.0
-[1.9]: https://plugins.trac.wordpress.org/changeset/485888/windows-azure-storage
-[1.8]: https://plugins.trac.wordpress.org/changeset/485513/windows-azure-storage
-[1.7]: https://plugins.trac.wordpress.org/changeset/484894/windows-azure-storage
-[1.6]: https://plugins.trac.wordpress.org/changeset/484891/windows-azure-storage
-[1.5]: https://plugins.trac.wordpress.org/changeset/484791/windows-azure-storage
-[1.4]: https://plugins.trac.wordpress.org/changeset/428894/windows-azure-storage
-[1.3]: https://plugins.trac.wordpress.org/changeset/424458/windows-azure-storage
-[1.2]: https://plugins.trac.wordpress.org/changeset/392854/windows-azure-storage
-[1.1]: https://plugins.trac.wordpress.org/changeset/354932/windows-azure-storage
-[1.0]: https://plugins.trac.wordpress.org/changeset/243465/windows-azure-storage
+[1.9.0]: https://plugins.trac.wordpress.org/changeset/485888/windows-azure-storage
+[1.8.0]: https://plugins.trac.wordpress.org/changeset/485513/windows-azure-storage
+[1.7.0]: https://plugins.trac.wordpress.org/changeset/484894/windows-azure-storage
+[1.6.0]: https://plugins.trac.wordpress.org/changeset/484891/windows-azure-storage
+[1.5.0]: https://plugins.trac.wordpress.org/changeset/484791/windows-azure-storage
+[1.4.0]: https://plugins.trac.wordpress.org/changeset/428894/windows-azure-storage
+[1.3.0]: https://plugins.trac.wordpress.org/changeset/424458/windows-azure-storage
+[1.2.0]: https://plugins.trac.wordpress.org/changeset/392854/windows-azure-storage
+[1.1.0]: https://plugins.trac.wordpress.org/changeset/354932/windows-azure-storage
+[1.0.0]: https://plugins.trac.wordpress.org/changeset/243465/windows-azure-storage

CONTRIBUTING.md

@@ -28,14 +28,16 @@ The `develop` branch is the development branch which means it contains the next
 
 ## Release instructions
 
-1. Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
-2.  Version bump: Bump the version number in `windows-azure-storage.php` and `readme.txt` if it does not already reflect the version being released.
+1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
+2. Version bump: Bump the version number in `composer.json`, `js/windows-azure-storage-admin.js`, `js/windows-azure-storage-media-browser.js`, `package.json`, `readme.txt`, and `windows-azure-storage.php` if it does not already reflect the version being released.
 3. Changelog: Add/update the changelog in both `readme.txt` and `CHANGELOG.md`.
-4. Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
-5. Readme updates: Make any other readme changes as necessary.  `CHANGELOG.md` and `README.md` are geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
-6. Merge: Make a non-fast-forward merge from `develop` to `master` (`git checkout master && git merge --no-ff develop`).
-7. Release: Create a [new release](https://github.com/10up/windows-azure-storage/releases/new), naming the tag and the release with the new version number. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the milestone (e.g. `https://github.com/10up/windows-azure-storage/milestone/2?closed=1`).  Close the milestone.
-8. SVN: Wait for the [GitHub Action](https://github.com/10up/windows-azure-storage/actions) to finish deploying to the WordPress.org repository.  If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
-9. Check WordPress.org: Ensure that the changes are live on [https://wordpress.org/plugins/windows-azure-storage/](https://wordpress.org/plugins/windows-azure-storage/). This may take a few minutes.
-10. Edit the [X.Y.Z milestone](https://github.com/10up/windows-azure-storage/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close `X.Y.Z` milestone.
-11. If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
+4. Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
+5. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
+6. Readme updates: Make any other readme changes as necessary.  `CHANGELOG.md` and `README.md` are geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
+7. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `master` (`git checkout master && git merge --no-ff develop`).  `master` contains the stable development version.
+8. Push: Push your master branch to GitHub, e.g. `git push origin master`.
+9. Release: Create a [new release](https://github.com/10up/windows-azure-storage/releases/new), naming the tag and the release with the new version number, and targeting the `master` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the milestone (e.g. `https://github.com/10up/windows-azure-storage/milestone/2?closed=1`).
+10. SVN: Wait for the [GitHub Action](https://github.com/10up/windows-azure-storage/actions) to finish deploying to the WordPress.org repository.  If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
+11. Check WordPress.org: Ensure that the changes are live on [https://wordpress.org/plugins/windows-azure-storage/](https://wordpress.org/plugins/windows-azure-storage/). This may take a few minutes.
+12. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/windows-azure-storage/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
+13. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.

CREDITS.md

@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Microsoft Open Technologies (@msopentech)](https://github.com/msopentech), [10up (@10up)](https://github.com/10up), [Morgan Estes (@morganestes)](https://github.com/morganestes), [Steve Grunwell (@stevegrunwell)](https://github.com/stevegrunwell), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Allan Collins (@allan23)](https://github.com/allan23), [@jpaarhuis](https://github.com/jpaarhuis), [Thorsten Ott (@tott)](https://github.com/tott), [Scott Lee (@scottlee)](https://github.com/scottlee), [Emmanuel Fidelino (@EmmanF)](https://github.com/EmmanF), [Joey Blake (@joeyblake)](https://github.com/joeyblake), [@mrgregwaugh](https://github.com/mrgregwaugh), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [Brad Parbs (@bradp)](https://github.com/bradp), [@bibinkurian](https://github.com/bibinkurian), [Anu Thomas Chandy (@anuchandy)](https://github.com/anuchandy), [Suman Chawla (@suchawla)](https://github.com/suchawla), [Justin Kopepasah (@kopepasah)](https://github.com/kopepasah), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Eduard Florea (@eflorea)](https://github.com/eflorea), [Jay Wood (@jaywood)](https://github.com/jaywood), [Ravi Chandra (@ravichdev)](https://github.com/ravichdev), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul).
+[Microsoft Open Technologies (@msopentech)](https://github.com/msopentech), [10up (@10up)](https://github.com/10up), [Morgan Estes (@morganestes)](https://github.com/morganestes), [Steve Grunwell (@stevegrunwell)](https://github.com/stevegrunwell), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Allan Collins (@allan23)](https://github.com/allan23), [@jpaarhuis](https://github.com/jpaarhuis), [Thorsten Ott (@tott)](https://github.com/tott), [Scott Lee (@scottlee)](https://github.com/scottlee), [Emmanuel Fidelino (@EmmanF)](https://github.com/EmmanF), [Joey Blake (@joeyblake)](https://github.com/joeyblake), [@mrgregwaugh](https://github.com/mrgregwaugh), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [Brad Parbs (@bradp)](https://github.com/bradp), [@bibinkurian](https://github.com/bibinkurian), [Anu Thomas Chandy (@anuchandy)](https://github.com/anuchandy), [Suman Chawla (@suchawla)](https://github.com/suchawla), [Justin Kopepasah (@kopepasah)](https://github.com/kopepasah), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Eduard Florea (@eflorea)](https://github.com/eflorea), [Jay Wood (@jaywood)](https://github.com/jaywood), [Ravi Chandra (@ravichdev)](https://github.com/ravichdev), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Ricardo Moraleida (@moraleida)](https://github.com/moraleida).
 
 ## Libraries
 

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "10up/windows-azure-storage",
   "description": "Use the Microsoft Azure Storage service to host your website's media files.",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "type": "wordpress-plugin",
   "keywords": [],
   "homepage": "https://10up.com",

js/windows-azure-storage-admin.js

@@ -1,4 +1,4 @@
-/*!  - v4.3.0
+/*!  - v4.3.1
  * https://github.com/10up/windows-azure-storage#readme
  * Copyright (c) 2019; */
 (function ( $, window, undefined ) {

js/windows-azure-storage-media-browser.js

@@ -1,4 +1,4 @@
-/*!  - v4.3.0
+/*!  - v4.3.1
  * https://github.com/10up/windows-azure-storage#readme
  * Copyright (c) 2019; */
 window.wp = window.wp || {};

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windows-azure-storage",
-	"version": "4.3.0",
+	"version": "4.3.1",
 	"description": "Microsoft Azure Storage for WordPress",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"