Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
dkotter committed Feb 29, 2024
2 parents 6a80f07 + e7eeea2 commit e659d08
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# These owners will be the default owners for everything in the repo. Unless a later match takes precedence, @10up/open-source-practice, as primary maintainers will be requested for review when someone opens a Pull Request.
* @10up/open-source-practice
# These owners will be the default owners for everything in the repo. Unless a later match takes precedence, @jeffpaul @dkotter, as primary maintainers will be requested for review when someone opens a Pull Request.
* @jeffpaul @dkotter

# GitHub and WordPress.org specifics
/.github/ @jeffpaul
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased]

## [1.2.4] - 2024-02-29
### Added
- Support for the WordPress.org plugin preview (props [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul) via [#137](https://github.com/10up/eight-day-week/pull/137)).

### Changed
- Bump WordPress "tested up to" version to 6.4 (props [@dhanendran](https://github.com/dhanendran), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#136](https://github.com/10up/eight-day-week/pull/136)).

### Fixed
- Undefined array key PHP warning (props [@dhanendran](https://github.com/dhanendran), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#136](https://github.com/10up/eight-day-week/pull/136)).

## [1.2.3] - 2023-09-20
### Added
- Error handling for environments that don't match our minimum PHP version (props [@bmarshall511](https://github.com/bmarshall511), [@iamdharmesh](https://github.com/iamdharmesh), [@dkotter](https://github.com/dkotter), [@vikrampm1](https://github.com/vikrampm1) via [#132](https://github.com/10up/eight-day-week/pull/132)).
Expand Down Expand Up @@ -119,6 +129,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial Release

[Unreleased]: https://github.com/10up/eight-day-week/compare/trunk...develop
[1.2.4]: https://github.com/10up/eight-day-week/compare/1.2.3...1.2.4
[1.2.3]: https://github.com/10up/eight-day-week/compare/1.2.2...1.2.3
[1.2.2]: https://github.com/10up/eight-day-week/compare/1.2.1...1.2.2
[1.2.1]: https://github.com/10up/eight-day-week/compare/1.2.0...1.2.1
Expand Down
4 changes: 2 additions & 2 deletions eight-day-week.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: Eight Day Week
* Description: Tools that help improve digital & print workflows.
* Version: 1.2.3
* Version: 1.2.4
* Author: 10up
* Author URI: https://10up.com
* License: GPLv2+
Expand Down Expand Up @@ -36,7 +36,7 @@
require_once __DIR__ . '/plugins.php';

// Useful global constants.
define( 'EDW_VERSION', '1.2.3' );
define( 'EDW_VERSION', '1.2.4' );
define( 'EDW_URL', Eight_Day_Week\plugins_url( __FILE__ ) );
define( 'EDW_PATH', __DIR__ . '/' );
define( 'EDW_INC', EDW_PATH . 'includes/' );
Expand Down
7 changes: 5 additions & 2 deletions includes/functions/print-issue.php
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,11 @@ function get_side_metabox_order( $order ) {

// Make submit div last.
if ( 'side' === $location ) {
// Remove submitdiv by value.
unset( $order[ $location ][ array_flip( $order[ $location ] )['submitdiv'] ] );
$locations = array_flip( $order[ $location ] );
if ( isset( $locations['submitdiv'] ) ) {
unset( $order[ $location ][ $locations['submitdiv'] ] );
}

$order[ $location ][] = 'submitdiv';
}

Expand Down
27 changes: 25 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "eight-day-week",
"title": "Eight Day Week",
"description": "Tools that help improve the digital/print production workflows.",
"version": "1.2.3",
"version": "1.2.4",
"homepage": "http://10up.com",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,6 +33,7 @@
"grunt-phpunit": "^0.3.6",
"grunt-wp-readme-to-markdown": "^2.0.1",
"load-grunt-tasks": "^5.1.0",
"mochawesome-json-to-md": "^0.7.2",
"qunit": "^2.9.3"
},
"keywords": [],
Expand Down
9 changes: 7 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Contributors: 10up, observerteam, joshlevinson, brs14ku, jeffpaul
Tags: print, workflow, editorial
Requires at least: 5.7
Tested up to: 6.3
Stable tag: 1.2.3
Tested up to: 6.4
Stable tag: 1.2.4
Requires PHP: 7.4
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -180,6 +180,11 @@ Gutenberg-based exports include some additional metadata/details that a Classic

== Changelog ==

= 1.2.4 - 2024-02-29 =
* **Added:** Support for the WordPress.org plugin preview (props [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul) via [#137](https://github.com/10up/eight-day-week/pull/137)).
* **Changed:** Bump WordPress "tested up to" version to 6.4 (props [@dhanendran](https://github.com/dhanendran), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#136](https://github.com/10up/eight-day-week/pull/136)).
* **Fixed:** Undefined array key PHP warning (props [@dhanendran](https://github.com/dhanendran), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#136](https://github.com/10up/eight-day-week/pull/136)).

= 1.2.3 - 2023-09-20 =
* **Added:** Error handling for environments that don't match our minimum PHP version (props [@bmarshall511](https://github.com/bmarshall511), [@iamdharmesh](https://github.com/iamdharmesh), [@dkotter](https://github.com/dkotter), [@vikrampm1](https://github.com/vikrampm1) via [#132](https://github.com/10up/eight-day-week/pull/132)).
* **Fixed:** Ensure multiple articles can be saved within each Print Issue section (props [@dkotter](https://github.com/dkotter), [@xLesy](https://github.com/xLesy), [@iamdharmesh](https://github.com/iamdharmesh) via [#131](https://github.com/10up/eight-day-week/pull/131)).
Expand Down

0 comments on commit e659d08

Please sign in to comment.