Skip to content

Commit

Permalink
Merge branch 'develop' for 2.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
helen committed Mar 21, 2020
2 parents e3154fe + 6e6fd57 commit a29ae58
Show file tree
Hide file tree
Showing 16 changed files with 815 additions and 253 deletions.
8 changes: 7 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
/.wordpress-org export-ignore
# Directories to ignore
/.github export-ignore
/.wordpress-org export-ignore

# Files to ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/CHANGELOG.md export-ignore
/CODE_OF_CONDUCT.md export-ignore
/CONTRIBUTING.md export-ignore
/CREDITS.md export-ignore
/Gruntfile.js export-ignore
/LICENSE.md export-ignore
/package.json export-ignore
/README.md export-ignore
32 changes: 0 additions & 32 deletions .github/main.workflow

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/push-asset-readme-update.yml
Original file line number Diff line number Diff line change
@@ -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 }}
16 changes: 16 additions & 0 deletions .github/workflows/push-deploy.yml
Original file line number Diff line number Diff line change
@@ -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@master
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.eslintcache
localization
node_modules
package-lock.json
package-lock.json
vendor/
164 changes: 164 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
# Changelog

All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/), and will adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased] - TBD

## [2.3.3] - 2020-03-04
### Added
- Nonce verify for AJAX requests (props [@pattonwebz](https://github.com/pattonwebz), [@dtbaker](https://github.com/dtbaker) via [#23](https://github.com/10up/simple-page-ordering/pull/23))

### Changed
- Disable Post Revisions now using the correct action of `post_updated` (props [@jakejackson1](https://github.com/jakejackson1) via [#26](https://github.com/10up/simple-page-ordering/pull/26))
- Bump WordPress version "tested up to" 5.3 (props [@adamsilverstein](https://github.com/adamsilverstein), [@dinhtungdu](https://github.com/dinhtungdu) via [#30](https://github.com/10up/simple-page-ordering/pull/30), [#36](https://github.com/10up/simple-page-ordering/pull/36))
- Documentation updates (props [@jeffpaul](https://github.com/jeffpaul) via [#31](https://github.com/10up/simple-page-ordering/pull/31), [#33](https://github.com/10up/simple-page-ordering/pull/33))

### Fixed
- Mismatched localized data variable name (props [@dinhtungdu](https://github.com/dinhtungdu) via [#36](https://github.com/10up/simple-page-ordering/pull/36))
- VIP Go coding standards (props [@asharirfan](https://github.com/asharirfan), [@dinhtungdu](https://github.com/dinhtungdu), [@pereirinha](https://github.com/pereirinha), [@brentvr](https://github.com/brentvr) via [#38](https://github.com/10up/simple-page-ordering/pull/38))

## [2.3.2] - 2018-05-08
### Added
- Allow cancellation of drag operation by pressing escape key

### Fixed
- Allow form input elements added to a row by plugins to be interacted with

## [2.3.1] - 2018-04-13
### Fixed
- Prevent rows with hidden columns from jumping around while dragging

## [2.3.0] - 2018-03-05
### Added
- Use WordPress core's spinner class
- Grunt-based build process with Sass

### Changed
- Use `WP_Query` instead of `get_posts()` for better performance
- Remove bundled translations in favor of WordPress.org language packs

### Fixed
- Avoid exceeding PHP's max input variables, which could cause incorrectly assigned page order
- Malformed URL that would take you to posts instead of pages
- PHPDoc and coding standards to align with 10up's Engineering Best Practices

## [2.2.4] - 2015-02-08
### Fixed
- Redundant URL encoding when sorting in admin page list

## [2.2.3] - 2014-09-27
### Fixed
- Ordering in WordPress 4.0 following core changes to `ORDER BY` in `WP_Query`

## [2.2.2] - 2014-08-19
### Added
- German localization (props [@glueckpress](https://github.com/glueckpress))

### Fixed
- Column widths no longer change when dragging a row (partial props [@thomasgriffin](https://github.com/thomasgriffin))

### Security
- Closed obscure XSS vulnerability related to Sort by Order link (props [@SimonWaters](https://github.com/SimonWaters))

## [2.2.1] - 2014-05-31
### Added
- Brazilian translation (props to "felds")

### Fixed
- Bring back translations / text domain (yikes!)

## [2.2.0] - 2014-04-06
### Changed
- Look and feel to better match WordPress 3.8 admin redesign
- Improved awareness of and compatibility with Quick Edit (inline editor)

### Fixed
- Prevent collisions with themes and plugins bundling Simple Page Ordering

## [2.1.2] - 2013-05-30
### Fixed
- Extreme edge case where post columns did not include the post title now supported

## [2.1.1] - 2013-05-27
### Fixed
- Custom post types with page-attributes or hierarchical properties, but not both, breaking ordering

## [2.1.0] - 2013-05-19
### Added
- Awareness of custom user capabilities for post types, in addition to a filter (`simple_page_ordering_edit_rights`) for overriding reordering rights (previously used `edit_others_pages` globally)
- Awareness of custom post statuses (so they are not skipped during backend ordering operation)

### Changed
- UI refinements: Better "spinner" positioning (and HiDPI), translucent row when moving, improved appearance of "drop" placeholder, wait till row dragged by at least 5px to start sorting
- Major JavaScript refactoring and simplification (combined with new stylesheet) for better performance

## [2.0.0] - 2012-11-12
### Added
- Drag pages into any part of the page hierarchy! No longer limited to same branch of tree!
- Big performance improvements under the hood: leaner queries, batched requests, less processing
- New filters and hooks to extend / override default functionality

### Changed
- Scales much more reliably in situations with very high page counts due to batching of requests
- Order of the first page is now set to "1" instead of "0", so pages added after ordering are added at the top (instead of second)
- Removed "number of pages" drop down, which is repetitive of a field accessible under Screen Options
- Improved compatibility with newer versions of WordPress

## [1.0.0] - 2011-07-04
### Added
- Support for ordering non-hierarchical post types that have "page-attributes" support
- New filter link for "Sort by Order" to restore (hierarchical) or set (non-hierarchical, page attributes support) post list sort to menu order

### Changed
- Users are now forced to wait for current sort operation to finish before they can sort another item
- Smarter about "not sortable" view states
- Localization ready! Rough Spanish translation included.
- Assorted other performance and code improvements

### Fixed
- Unexpected page ordering results when pages have not been explictly ordered yet (sorts by menu_order, then title, not just menu_order)
- "Per page" drop down filter selection not saving between page loads (was broken in 3.1)
- Items are always ordered with positive integers (potential negative sort orders had some performance benefits in last version, but sometimes caused issues)

## [0.9.6] - 2011-04-04
### Fixed
- Broken inline editing (quick edit) fields in Firefox

## [0.9.5] - 2011-03-27
### Changed
- Smarter awareness of "sorted" modes in WordPress 3.1 (can only use when sorted by menu order)
- Smarter awareness of "quick edit" mode (can't drag)
- Generally simplified / better organized code

## [0.9.0] - 2010-12-29
### Added
- Further directions in the plug-in description (some users were confused about how to use it)
- Basic compatibility with 3.1 RC (prevent clashes with post list sorting)

### Changed
- "Move" cursor only set if JavaScript enabled

### Fixed
- Page count display always showing "0" on non-hierarchical post types (Showing 1-X of X)
- Hidden menu order not updating after sort (causing Quick Edit to reset order when used right after sorting)

## [0.8.4] - 2010-08-24
### Changed
- Loosened constraints on drag and drop to ease dropping into top and bottom position
- Improved some terminology (with custom post types in mind)

### Fixed
- Row background staying "white" after dropping into a new position
- Double border on the bottom of the row while dragging

## [0.8.2] - 2010-08-21
### Changed
- Simplified code - consolidated hooks
- Updated version requirements

[Unreleased]: https://github.com/10up/simple-page-ordering/compare/master...develop
[2.3.3]: https://github.com/10up/simple-page-ordering/compare/2.3.2...2.3.3
[2.3.2]: https://github.com/10up/simple-page-ordering/compare/2.3.1...2.3.2
[2.3.1]: https://github.com/10up/simple-page-ordering/compare/2.3...2.3.1
[2.3.0]: https://github.com/10up/simple-page-ordering/compare/2.2.4...2.3
[2.2.4]: https://github.com/10up/simple-page-ordering/releases/tag/2.2.4
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
25 changes: 13 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,16 @@ Head to the Pages list table and drag and drop pages to change the order. Refres

### Release instructions

1. Version bump: Bump the version number in `simple-page-ordering.php`.
2. Changelog: Add/update the changelog in both `readme.txt` and `README.md`
3. 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.
4. Merge: Make a non-fast-forward merge from `develop` to `master`.
5. SVN update: Copy files over to the `trunk` folder of an SVN checkout of the plugin. If the plugin banner, icon, or screenshots have changed, copy those to the top-level `assets` folder. Commit those changes.
6. SVN tag: Make a folder inside `tags` with the current version number, copy the contents of `trunk` into it, and commit with the message `Tagging X.Y.Z`. There is also an SVN command for tagging; however, note that it runs on the remote and requires care because the entire WordPress.org plugins repo is actually single SVN repo.
7. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/simple-page-ordering/. This may take a few minutes.
8. Git tag: Tag the release in Git and push the tag to GitHub. It should now appear under [releases](https://github.com/10up/simple-page-ordering/releases) there as well.

<p align="center">
<a href="http://10up.com/contact/"><img src="https://10updotcom-wpengine.s3.amazonaws.com/uploads/2016/10/10up-Github-Banner.png" width="850"></a>
</p>
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`, `readme.txt`, and `simple-page-ordering.php` if it does not already reflect the version being released.
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 `.gitattributes`.
6. 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.
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/simple-page-ordering/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 [X.Y.Z milestone](https://github.com/10up/simple-page-ordering/milestone/#?closed=1). The release should now appear under [releases](https://github.com/10up/simple-page-ordering/releases) and in the WordPress admin as an update as well.
10. SVN: Wait for the [GitHub Action](https://github.com/10up/simple-page-ordering/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/simple-page-ordering/. This may take a few minutes.
12. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/simple-page-ordering/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`.
19 changes: 19 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
The following acknowledges the Maintainers for this repository, those who have Contributed to this repository (via bug reports, code, design, ideas, project management, translation, testing, etc.), and any Libraries utilized.

## Maintainers

The following individuals are responsible for curating the list of issues, responding to pull requests, and ensuring regular releases happen.

[Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher) and [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.

[10up (@10up)](https://github.com/10up), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Helen Hou-Sandí (@helen)](https://github.com/helen), [Oomph, Inc. (@oomphinc)](https://github.com/oomphinc), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Ashar Irfan (@asharirfan)](https://github.com/asharirfan), [William Patton (@pattonwebz)](https://github.com/pattonwebz), [Ben Huson (@benhuson)](https://github.com/benhuson), [Jake Jackson (@jakejackson1)](https://github.com/jakejackson1), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [@dtbaker](https://github.com/dtbaker), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Marco Pereirinha (@pereirinha)](https://github.com/pereirinha), [Brent van Rensburg (@brentvr)](https://github.com/brentvr), [Caspar Hübinger (@glueckpress)](https://github.com/glueckpress), [Thomas Griffin (@thomasgriffin)](https://github.com/thomasgriffin), [Simon Waters (@SimonWaters)](https://github.com/SimonWaters), [Dion Hulse (@dd32)](https://github.com/dd32).

## Libraries

The following software libraries are utilized in this repository.

n/a.
Loading

0 comments on commit a29ae58

Please sign in to comment.