Merge pull request #20 from 10up/release/1.0.5

jeffpaul · web-flow · commit 7faeedcb1660 · 2021-03-05T16:16:41.000-06:00
Release/1.0.5
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,26 @@
+# Directories
+/.git export-ignore
+/.github export-ignore
+/.wordpress-org export-ignore
+
+# Files
+/.babelrc export-ignore
+/.browserslistrc export-ignore
+/.DS_Store export-ignore
+/.editorconfig export-ignore
+/.eslintignore export-ignore
+/.eslintrc export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/CHANGELOG.md export-ignore
+/CODE_OF_CONDUCT.md export-ignore
+/composer.json export-ignore
+/composer.lock export-ignore
+/CONTRIBUTING.md export-ignore
+/CREDITS.md export-ignore
+/LICENSE.md export-ignore
+/package-lock.json export-ignore
+/package.json export-ignore
+/phpcs.xml export-ignore
+/postcss.config.js export-ignore
+/README.md export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,20 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased]
 
-## [1.0.5] - TBD
+## [1.0.5] - 2021-03-05
 - Initial public release 🎉.
 
+### Added
+- Plugin banner and icon assets (props [@McCallumDillon](https://github.com/McCallumDillon), [@cgoozen](https://profiles.wordpress.org/cgoozen/) via [#8](https://github.com/10up/secure-media/pull/8), [#14](https://github.com/10up/secure-media/pull/14)).
+- Documentation and GitHub Action updates (props [@jeffpaul](https://github.com/jeffpaul), [@dinhtungdu](https://github.com/dinhtungdu) via [#16](https://github.com/10up/secure-media/pull/16), [#17](https://github.com/10up/secure-media/pull/17)).
+
+### Changed
+- Code spacing, documentation, translated strings, formatting, and other code cleanup tasks (props [@dkotter](https://github.com/dkotter) via [#15](https://github.com/10up/secure-media/pull/15)).
+
+### Security
+- Bump `ini` from 1.3.5 to 1.3.8 (props [@dependabot](https://github.com/apps/dependabot) via [#10](https://github.com/10up/secure-media/pull/10), [#13](https://github.com/10up/secure-media/pull/13)).
+- Update NPM packages for `axios` and `socket.io` to fix vulnerabilities (props [@joshuaabenazer](https://github.com/joshuaabenazer) via [#18](https://github.com/10up/secure-media/pull/18)).
+
 ## [1.0.4] - 2021-01-04
 ### Fixed
 - Better S3 error logging (props [@tlovett1](https://github.com/tlovett1)).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,16 +29,16 @@ The `develop` branch is the development branch which means it contains the next
 ## Release instructions
 
 1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
-1. Version bump: Bump the version number in `composer.json`, `package.json`, `readme.txt`, and `secure-media.php` if it does not already reflect the version being released.  Update both the plugin "Version:" property and the plugin `SM_VERSION` constant in `secure-media.php`. 
+1. Version bump: Bump the version number in `package.json`, `readme.txt`, and `secure-media.php` if it does not already reflect the version being released.  Update both the plugin "Version:" property and the plugin `SM_VERSION` constant in `secure-media.php`. 
 1. Changelog: Add/update the changelog in both `readme.txt` and `CHANGELOG.md`.
 1. Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
 1. Readme updates: Make any other readme changes as necessary.  `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
 1. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.gitattributes`.
 1. 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 `trunk` (`git checkout trunk && git merge --no-ff develop`).  `trunk` contains the stable development version.
 1. Test: While still on the `trunk` branch, test for functionality locally.
 1. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).
-1. Release: Create a [new release](https://github.com/10up/secure-media/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` 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/secure-media/milestone/#?closed=1`).
+1. Release: Create a [new release](https://github.com/10up/secure-media/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` 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/secure-media/milestone/#?closed=1`).  The release should now appear under [releases](https://github.com/10up/secure-media/releases).
 1. SVN: Wait for the [GitHub Action](https://github.com/10up/secure-media/actions/new) 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.
 1. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/secure-media/.  This may take a few minutes.
 1. Close milestone: Edit the [milestone](https://github.com/10up/secure-media/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
-1. 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`.
+1. 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`.
diff --git a/CREDITS.md b/CREDITS.md
@@ -12,10 +12,10 @@ 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.
 
-[Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Junaid Bhura (@junaidbhura)](https://github.com/junaidbhura), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Dillon McCallum (@McCallumDillon)](https://github.com/McCallumDillon), [Cassi Goozen (@cgoozen)](https://profiles.wordpress.org/cgoozen/).
+[Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Junaid Bhura (@junaidbhura)](https://github.com/junaidbhura), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Dillon McCallum (@McCallumDillon)](https://github.com/McCallumDillon), [Cassi Goozen (@cgoozen)](https://profiles.wordpress.org/cgoozen/), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu).
 
 ## Libraries
 
 The following software libraries are utilized in this repository.
 
-N/A.
+N/A.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 > Store private media securely in WordPress.
 
-[![Support Level](https://img.shields.io/badge/support-beta-blueviolet.svg)](#support-level) [![GPLv2 License](https://img.shields.io/github/license/10up/secure-media.svg)](https://github.com/10up/secure-media/blob/develop/LICENSE.md)
+[![Support Level](https://img.shields.io/badge/support-beta-blueviolet.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/secure-media.svg)](https://github.com/10up/secure-media/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.6%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/secure-media.svg)](https://github.com/10up/secure-media/blob/develop/LICENSE.md)
 
 This plugins stores media associated with non-public posts in S3 with private visibility. Image requests for private media are proxied through WordPress to ensure proper user capabilities. Once a post a published, all it's media is made public and transfered to the WordPress public uploads folder. Media uploaded outside of posts e.g. the media library are made private as well.
 
diff --git a/composer.json b/composer.json
@@ -1,7 +1,6 @@
 {
   "name": "10up/secure-media",
   "description": "Store private media securely in WordPress.",
-  "version": "1.0.4",
   "type": "wordpress-plugin",
   "homepage": "https://10up.com",
   "license": ["GPL-2.0-or-later"],
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "secure-media",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Store private media securely in WordPress.",
   "author": {
     "name": "10up",
diff --git a/readme.txt b/readme.txt
@@ -1,12 +1,12 @@
 === Secure Media ===
-Contributors: 10up, tlovett1
-Tags: AWS, S3, secure, private, media
+Contributors:      10up, tlovett1
+Tags:              AWS, S3, secure, private, media
 Requires at least: 
-Tested up to: 5.6
-Requires PHP: 
-Stable tag: 1.0.4
-License: GPLv2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Tested up to:      5.6
+Requires PHP:      5.6
+Stable tag:        1.0.5
+License:           GPLv2 or later
+License URI:       http://www.gnu.org/licenses/gpl-2.0.html
 
 Store private media securely in WordPress.
 
@@ -25,6 +25,11 @@ This plugins stores media associated with non-public posts in S3 with private vi
  
 = 1.0.5 =
 * Initial public release 🎉.
+* **Added:** Plugin banner and icon assets (props [@McCallumDillon](https://github.com/McCallumDillon), [@cgoozen](https://profiles.wordpress.org/cgoozen/)).
+* **Added:** Documentation and GitHub Action updates (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul/), [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/)).
+* **Changed:** Code spacing, documentation, translated strings, formatting, and other code cleanup tasks (props [@dkotter](https://profiles.wordpress.org/dkotter/)).
+* **Security:** Bump `ini` from 1.3.5 to 1.3.8 (props [@dependabot](https://github.com/apps/dependabot)).
+* **Security:** Update NPM packages for `axios` and `socket.io` to fix vulnerabilities (props [@joshuaabenazer](https://profiles.wordpress.org/joshuaabenazer/)).
 
 = 1.0.4 =
 * **Fixed:** Better S3 error logging (props [@tlovett1](https://profiles.wordpress.org/tlovett1/)).
diff --git a/secure-media.php b/secure-media.php
@@ -5,7 +5,7 @@
  * Description:       Store private media securely in WordPress
  * Version:           1.0.5
  * Requires at least:
- * Requires PHP:
+ * Requires PHP:      5.6
  * Author:            10up
  * Author URI:        https://10up.com
  * License:           GPLv2 or later

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "10up/secure-media",`
`3`	`3`	`"description": "Store private media securely in WordPress.",`
`4`		`- "version": "1.0.4",`
`5`	`4`	`"type": "wordpress-plugin",`
`6`	`5`	`"homepage": "https://10up.com",`
`7`	`6`	`"license": ["GPL-2.0-or-later"],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "secure-media",`
`3`		`- "version": "1.0.4",`
	`3`	`+ "version": "1.0.5",`
`4`	`4`	`"description": "Store private media securely in WordPress.",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "10up",`