Merge pull request #106 from 10up/develop

Release 4.3.0 to WordPress.org

.distignore

@@ -0,0 +1,19 @@
+/.github
+/.git
+/.wordpress-org
+/node_modules
+/tasks
+
+.DS_Store
+.eslintrc.json
+.distignore
+.gitignore
+CHANGELOG.md
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+CREDITS.md
+Gruntfile.js
+LICENSE
+package.json
+package-lock.json
+README.md

.github/workflows/push-asset-readme-update.yml

@@ -0,0 +1,16 @@
+name: Plugin asset/readme update
+on:
+  push:
+    branches:
+    - master
+jobs:
+  master:
+    name: Push to master
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: WordPress.org plugin asset/readme update
+      uses: 10up/action-wordpress-plugin-asset-update@master
+      env:
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/push-deploy.yml

@@ -0,0 +1,16 @@
+name: Deploy to WordPress.org
+on:
+  push:
+    tags:
+    - "*"
+jobs:
+  tag:
+    name: New tag
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: WordPress Plugin Deploy
+      uses: 10up/action-wordpress-plugin-deploy@develop
+      env:
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

CONTRIBUTING.md

@@ -25,3 +25,17 @@ For more on how 10up writes and manages code, check out our [10up Engineering Be
 ## Workflow
 
 The `develop` branch is the development branch which means it contains the next version to be released.  `stable` contains the current latest release and `master` contains the corresponding stable development version.  Always work on the `develop` branch and open up PRs against `develop`.
+
+## 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.
+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`.

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), [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).
 
 ## Libraries
 

composer.json

@@ -0,0 +1,20 @@
+{
+  "name": "10up/windows-azure-storage",
+  "description": "Use the Microsoft Azure Storage service to host your website's media files.",
+  "version": "4.3.0",
+  "type": "wordpress-plugin",
+  "keywords": [],
+  "homepage": "https://10up.com",
+  "license": "GPL-2.0+",
+  "authors": [
+    {
+      "name": "10up",
+      "email": "[email protected]",
+      "role": "Developer"
+    }
+  ],
+  "minimum-stability": "dev",
+  "require": {
+    "php": ">=5.6"
+  }
+}

css/windows-azure-storage.css

@@ -34,7 +34,7 @@
 }
 
 #windows-azure-storage-browser .delete-attachment {
-	color: red;
+	color: #cc0000;
 }
 
 #windows-azure-storage-browser .media-toolbar.wp-filter  .media-toolbar-primary.search-form {

includes/compat.php

@@ -40,13 +40,12 @@ function restore_original_image( $file, $attachment_id ) {
 	}
 
 	/*
-	 * Next, ensure we're using WP-CLI's `media regenerate` command: `wp media regenerate`.
+	 * Flip the array and check for the presence of media & regenerate.
 	 *
-	 * [0] will be the path to WP-CLI.
-	 * [1] should be "media".
-	 * [2] should be "regenerate".
+	 * Array flipping is faster and more performant than in_array twice, even w/ strict set to true.
 	 */
-	if ( 'media' !== $argv[1] || 'regenerate' !== $argv[2] ) {
+	$args = array_flip( $argv );
+	if ( ! isset( $args['media'], $args['regenerate'] ) ) {
 		return $file;
 	}
 

js/windows-azure-storage-admin.js

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