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

Release/3.3.1

Author: jeffpaul

.github/workflows/lint.yml

@@ -17,4 +17,4 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: PHPCS check
-      uses: 10up/wpcs-action@master
+      uses: 10up/wpcs-action@stable

CHANGELOG.md

@@ -3,11 +3,16 @@
 All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
 
 ## [Unreleased] - TBD
+
+## [3.3.1] - TBD
+**Note that this release replaces references of `master` with `trunk` so please plan to update any references you have from `master` to `trunk` to ensure you continue to receive the latest updates on this plugin.**
+
 ### Changed
-- Bump WordPress version "tested up to" 5.9 (props [@sudip-10up](https://github.com/sudip-10up) via []().
+- Bump WordPress version “tested up to” 5.9 (props [David Chabbi](https://profiles.wordpress.org/davidchabbi/), [@jeffpaul](https://github.com/jeffpaul), [@ciprianimike](https://github.com/ciprianimike), [@sudip-10up](https://github.com/sudip-10up) via [#12](https://github.com/10up/mce-table-buttons/pull/12), [#18](https://github.com/10up/mce-table-buttons/pull/18), [#23](https://github.com/10up/mce-table-buttons/pull/23)).
+- Updated documentation including new GitHub Actions (props [@jeffpaul](https://github.com/jeffpaul), [@dinhtungdu](https://github.com/dinhtungdu) via [#5](https://github.com/10up/mce-table-buttons/pull/5), [#13](https://github.com/10up/mce-table-buttons/pull/13), [#15](https://github.com/10up/mce-table-buttons/pull/15)).
 
 ### Fixed
-- Issues reported by PHPCS WPCS v2.3.0 addressed (props []() via []()).
+- Issues reported by PHPCS WPCS v2.3.0 (props [@ciprianimike](https://github.com/ciprianimike), [@dinhtungdu](https://github.com/dinhtungdu) via [#17](https://github.com/10up/mce-table-buttons/pull/17)).
 
 ## [3.3] - 2018-06-15
 ### Changed
@@ -69,6 +74,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Initial plugin release :tada:
 
 [Unreleased]: https://github.com/10up/mce-table-buttons/compare/trunk...develop
+[3.3.1]: https://github.com/10up/mce-table-buttons/compare/3.3...3.3.1
 [3.3]: https://github.com/10up/mce-table-buttons/commit/7b1f57e
 [3.2]: https://plugins.trac.wordpress.org/changeset/971857/
 [3.1]: https://plugins.trac.wordpress.org/changeset/924344/

CONTRIBUTING.md

@@ -29,13 +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.
-2. Version bump: Bump the version number in `mce_table_buttons.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. New files: 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 `trunk` (`git checkout trunk && git merge --no-ff develop`).
-7. Release: Create a [new release](https://github.com/10up/mce-table-buttons/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/mce-table-buttons/milestone/1?closed=1`).  Close the milestone.
-8. SVN: Wait for the [GitHub Action](https://github.com/10up/mce-table-buttons/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/mce-table-buttons/](https://wordpress.org/plugins/mce-table-buttons/). This may take a few minutes.
-10. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/mce-table-buttons/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. 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. Version bump: Bump the version number in `class-mce-table-buttons.php` and `readme.txt` if it does not already reflect the version being released.
+1. Changelog: Add/update the changelog in both `CHANGELOG.md` and `readme.txt`.
+1. Props: update `CREDITS.md` with any new contributors, confirm maintainers are accurate.
+1. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
+1. Readme updates: Make any other readme changes as necessary.  `README.md` are geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
+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 latest stable release.
+1. Test: Run through common tasks while on `trunk` to be sure it functions correctly.
+1. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).
+1. Release: Create a [new release](https://github.com/10up/mce-table-buttons/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](https://github.com/10up/mce-table-buttons/milestone/#?closed=1).
+1. SVN: Wait for the [GitHub Action](https://github.com/10up/mce-table-buttons/actions/workflows/dotorg-push-deploy.yml) 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/mce-table-buttons/](https://wordpress.org/plugins/mce-table-buttons/).  This may take a few minutes.
+1. Close milestone: Edit the [milestone](https://github.com/10up/mce-table-buttons/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`.

CREDITS.md

@@ -4,13 +4,13 @@ The following acknowledges the Maintainers for this repository, those who have C
 
 The following individuals are responsible for curating the list of issues, responding to pull requests, and ensuring regular releases happen.
 
-[Helen Hou-Sandi (@helen)](https://github.com/helen) and [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul).
+[Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul).
 
 ## Contributors
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [David Chabbi (@davidchabbi)](https://profiles.wordpress.org/davidchabbi/), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up).
+[Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [David Chabbi (@davidchabbi)](https://profiles.wordpress.org/davidchabbi/), [Michele Cipriani (@ciprianimike)](https://github.com/ciprianimike), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up).
 
 ## Libraries
 

README.md

@@ -2,7 +2,7 @@
 
 > Adds table editing controls to the visual content editor (TinyMCE).
 
-[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/mce-table-buttons.svg)](https://github.com/10up/mce-table-buttons/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/mce-table-buttons?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/mce-table-buttons.svg)](https://github.com/10up/mce-table-buttons/blob/develop/LICENSE.md)
+[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) [![Linting](https://github.com/10up/mce-table-buttons/actions/workflows/lint.yml/badge.svg)](https://github.com/10up/mce-table-buttons/actions/workflows/lint.yml) [![Release Version](https://img.shields.io/github/release/10up/mce-table-buttons.svg)](https://github.com/10up/mce-table-buttons/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/mce-table-buttons?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/mce-table-buttons.svg)](https://github.com/10up/mce-table-buttons/blob/develop/LICENSE.md)
 
 ## Overview
 

class-mce-table-buttons.php

@@ -1,14 +1,20 @@
 <?php
 /**
- * Plugin Name: MCE Table Buttons
- * Plugin URI: http://10up.com/plugins-modules/wordpress-mce-table-buttons/
- * Description: Add <strong>controls for table editing</strong> to the visual content editor with this <strong>light weight</strong> plug-in.
- * Version: 3.3
- * Author: Jake Goldman, 10up, Oomph
- * Author URI: http://10up.com
- * License: GPLv2 or later
+ * MCE Table Buttons
  *
- * @package MCETableButtons
+ * @package           MCETableButtons
+ * 
+ * @wordpress-plugin
+ * Plugin Name:       MCE Table Buttons
+ * Plugin URI:        http://10up.com/plugins-modules/wordpress-mce-table-buttons/
+ * Description:       Add <strong>controls for table editing</strong> to the visual content editor with this <strong>light weight</strong> plug-in.
+ * Version:           3.3.1
+ * Requires at least: 4.0
+ * Requires PHP:      
+ * Author:            Jake Goldman, 10up, Oomph
+ * Author URI:        https://10up.com
+ * License:           GPL v2 or later
+ * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
  */
 
 /**

readme.txt

@@ -1,10 +1,13 @@
 === MCE Table Buttons ===
-Contributors: 10up, jakemgold, helen, thinkoomph
-Donate link: http://10up.com/plugins-modules/wordpress-mce-table-buttons/
-Tags: tables, table, editor, WYSIWYG, buttons, tinymce
+Contributors:      10up, jakemgold, helen, thinkoomph
+Donate link:       http://10up.com/plugins-modules/wordpress-mce-table-buttons/
+Tags:              tables, table, editor, WYSIWYG, buttons, tinymce, classic editor
 Requires at least: 4.0
-Tested up to: 5.9
-Stable tag: 3.3
+Tested up to:      5.9
+Stable tag:        3.3.1
+Requires PHP:      
+License:           GPLv2 or later
+License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 
 Adds table editing controls to the visual content editor (TinyMCE).
 
@@ -29,6 +32,13 @@ Note that the table controls are contained in the “kitchen sink” toolbar, to
 
 == Changelog ==
 
+= 3.3.1 =
+**Note that this release replaces references of `master` with `trunk` so please plan to update any references you have from `master` to `trunk` to ensure you continue to receive the latest updates on this plugin.**
+
+* **Changed:** Bump WordPress version “tested up to” 5.8 (props [David Chabbi](https://profiles.wordpress.org/davidchabbi/), [@jeffpaul](https://github.com/jeffpaul), [@ciprianimike](https://github.com/ciprianimike)).
+* **Changed:**  Updated documentation including new GitHub Actions (props [@jeffpaul](https://github.com/jeffpaul), [@dinhtungdu](https://github.com/dinhtungdu)).
+* **Fixed:** Issues reported by PHPCS WPCS v2.3.0 (props [@ciprianimike](https://github.com/ciprianimike), [@dinhtungdu](https://github.com/dinhtungdu)).
+
 = 3.3 =
 * Significantly update TinyMCE plugin from 4.1.x to 4.7.11
 * Drop support for WordPress 3.x, which means dropping TinyMCE 3.x and 4.0.x
@@ -72,5 +82,8 @@ Note that the table controls are contained in the “kitchen sink” toolbar, to
 
 == Upgrade Notice ==
 
+= 3.3.1 =
+This release replaces references of `master` with `trunk` so please plan to update any references you have from `master` to `trunk` to ensure you continue to receive the latest updates on this plugin.
+
 = 1.5 =
 REQUIRES WordPress 3.3 or higher. Finally links table buttons row to kitchen sink!