Merge branch 'develop' into trunk

CHANGELOG.md

@@ -4,7 +4,15 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
-## [2.6.0] - TBD
+## [2.6.1] - 2023-11-08
+### Changed
+- Bump WordPress "tested up to" version 6.4 (props [@jeffpaul](https://github.com/jeffpaul), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@faisal-alvi](https://github.com/faisal-alvi) via [#177](https://github.com/10up/simple-page-ordering/pull/177)).
+- Remove the .git directory from the `10up-lib` directory (props [@Sidsector9](https://github.com/Sidsector9), [@dkotter](https://github.com/dkotter) via [#175](https://github.com/10up/simple-page-ordering/pull/175)).
+
+### Security
+- Bumps `@babel/traverse` from `7.20.12` to `7.23.2` (props [@peterwilsoncc](https://github.com/peterwilsoncc) via [#170](https://github.com/10up/simple-page-ordering/pull/170)).
+
+## [2.6.0] - 2023-10-25
 ### Added
 - A check for minimum required PHP version before loading the plugin (props [@vikrampm1](https://github.com/vikrampm1), [@kmgalanakis](https://github.com/kmgalanakis), [@Sidsector9](https://github.com/Sidsector9) via [#153](https://github.com/10up/simple-page-ordering/pull/153)).
 - Mochawesome reporter added for Cypress test report (props [@iamdharmesh](https://github.com/iamdharmesh), [@jayedul](https://github.com/jayedul), [@faisal-alvi](https://github.com/faisal-alvi) via [#146](https://github.com/10up/simple-page-ordering/pull/146)).
@@ -278,6 +286,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Updated version requirements.
 
 [Unreleased]: https://github.com/10up/simple-page-ordering/compare/trunk...develop
+[2.6.1]: https://github.com/10up/simple-page-ordering/compare/2.6.0...2.6.1
 [2.6.0]: https://github.com/10up/simple-page-ordering/compare/2.5.1...2.6.0
 [2.5.1]: https://github.com/10up/simple-page-ordering/compare/2.5.0...2.5.1
 [2.5.0]: https://github.com/10up/simple-page-ordering/compare/2.4.4...2.5.0

CONTRIBUTING.md

@@ -64,7 +64,7 @@ Head to the Pages list table and drag and drop pages to change the order. Refres
 ### 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 `package.json`, `package-lock.json`, `readme.txt`, and `simple-page-ordering.php` if it does not already reflect the version being released. In `simple-page-ordering.php` update both the plugin "Version:" property and the plugin `SIMPLE_PAGE_ORDERING_VERSION` constant.
+2. Version bump: Bump the version number in `class-simple-page-ordering.php`, `package.json`, `package-lock.json`, `readme.txt`, and `simple-page-ordering.php` if it does not already reflect the version being released. In `simple-page-ordering.php` update both the plugin "Version:" property and the plugin `SIMPLE_PAGE_ORDERING_VERSION` constant.
 3. Changelog: Add/update the changelog in `readme.txt` and `CHANGELOG.md`.
 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`.

class-simple-page-ordering.php

@@ -8,7 +8,7 @@
 use WP_Query;
 
 // Useful global constants.
-define( 'SIMPLE_PAGE_ORDERING_VERSION', '2.5.1' );
+define( 'SIMPLE_PAGE_ORDERING_VERSION', '2.6.1' );
 
 if ( ! class_exists( 'Simple_Page_Ordering' ) ) :
 

package.json

@@ -1,9 +1,9 @@
 {
   "name": "simple-page-ordering",
   "description": "Order your pages and other hierarchical post types with simple drag and drop right from the standard page list.",
-  "version": "2.6.0",
-  "author": "10up <[email protected]>",
-  "license": "GPLv2 ( or later )",
+  "version": "2.6.1",
+  "author": "10up <[email protected]> (https://10up.com)",
+  "license": "GPL-2.0-or-later",
   "devDependencies": {
     "@10up/babel-preset-default": "^2.0.4",
     "@10up/cypress-wp-utils": "^0.2.0",

readme.txt

@@ -4,8 +4,8 @@ Donate link:       http://10up.com/plugins/simple-page-ordering-wordpress/
 Tags:              order, re-order, ordering, pages, page, manage, menu_order, hierarchical, ajax, drag-and-drop, admin
 Requires at least: 5.7
 Requires PHP:      7.4
-Tested up to:      6.3
-Stable tag:        2.6.0
+Tested up to:      6.4
+Stable tag:        2.6.1
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -110,7 +110,12 @@ Yes. The plugin registers the REST endpoint `simple-page-ordering/v1/page_orderi
 
 == Changelog ==
 
-= 2.6.0 - TBD =
+= 2.6.1 - 2023-11-08 =
+* **Changed:** Bump WordPress "tested up to" version 6.4 (props [@jeffpaul](https://github.com/jeffpaul), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@faisal-alvi](https://github.com/faisal-alvi) via [#177](https://github.com/10up/simple-page-ordering/pull/177)).
+* **Changed:** Remove the .git directory from the `10up-lib` directory (props [@Sidsector9](https://github.com/Sidsector9), [@dkotter](https://github.com/dkotter) via [#175](https://github.com/10up/simple-page-ordering/pull/175)).
+* **Security:** Bumps `@babel/traverse` from `7.20.12` to `7.23.2` (props [@peterwilsoncc](https://github.com/peterwilsoncc) via [#170](https://github.com/10up/simple-page-ordering/pull/170)).
+
+= 2.6.0 - 2023-10-25 =
 * **Added:** A check for minimum required PHP version before loading the plugin (props [@vikrampm1](https://github.com/vikrampm1), [@kmgalanakis](https://github.com/kmgalanakis), [@Sidsector9](https://github.com/Sidsector9) via [#153](https://github.com/10up/simple-page-ordering/pull/153)).
 * **Added:** Mochawesome reporter added for Cypress test report (props [@iamdharmesh](https://github.com/iamdharmesh), [@jayedul](https://github.com/jayedul), [@faisal-alvi](https://github.com/faisal-alvi) via [#146](https://github.com/10up/simple-page-ordering/pull/146)).
 * **Added:** Repo Automator GitHub Action (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#158](https://github.com/10up/simple-page-ordering/pull/158)).

simple-page-ordering.php

@@ -3,7 +3,7 @@
  * Plugin Name:       Simple Page Ordering
  * Plugin URI:        http://10up.com/plugins/simple-page-ordering-wordpress/
  * Description:       Order your pages and hierarchical post types using drag and drop on the built in page list. For further instructions, open the "Help" tab on the Pages screen.
- * Version:           2.6.0
+ * Version:           2.6.1
  * Requires at least: 5.7
  * Requires PHP:      7.4
  * Author:            10up

tests/cypress/integration/admin.test.js

@@ -27,14 +27,14 @@ describe('Admin can login and make sure plugin is activated', () => {
 		cy.login();
 		cy.visit( '/wp-admin/edit.php?post_type=page' );
 		cy.get( '#show-settings-link' ).click();
-		cy.get( '#edit_page_per_page' ).clear().type( '2' );
+		cy.get( '#edit_page_per_page' ).type( '{selectAll}{del}2' );
 		cy.get( '#screen-options-apply' ).click();
 		cy.get( '.byorder' ).click();
 		cy.get( '.pagination-links' ).should( 'be.visible' );
 
 		// Restore default pagination.
 		cy.get( '#show-settings-link' ).click();
-		cy.get( '#edit_page_per_page' ).clear().type( '10' );
+		cy.get( '#edit_page_per_page' ).type( '{selectAll}{del}10' );
 		cy.get( '#screen-options-apply' ).click();
 	});
 });