From c558febd6e9d5da5cfa0b0f97a84007e232b7c30 Mon Sep 17 00:00:00 2001 From: Siddharth Thevaril Date: Wed, 28 Jun 2023 14:01:03 +0530 Subject: [PATCH 1/5] fix: remove additional comma causing fatal error --- includes/ConvertToBlocks/Settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/ConvertToBlocks/Settings.php b/includes/ConvertToBlocks/Settings.php index ee83cf5..98c2d6f 100644 --- a/includes/ConvertToBlocks/Settings.php +++ b/includes/ConvertToBlocks/Settings.php @@ -256,7 +256,7 @@ public function filter_notice() {

From 9c0c495b4990458d820084b4d537ede2de3ae450 Mon Sep 17 00:00:00 2001 From: Siddharth Thevaril Date: Wed, 28 Jun 2023 14:07:56 +0530 Subject: [PATCH 2/5] update documentation --- CHANGELOG.md | 5 +++++ convert-to-blocks.php | 2 +- package.json | 2 +- readme.txt | 5 ++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edcb7c5..7144685 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD +## [1.2.1] - 2023-06-28 + +### Fixed +- Parse error caused by a comma (props [@Sidsector9](https://github.com/Sidsector9) via [#123](https://github.com/10up/convert-to-blocks/pull/123)). + ## [1.2.0] - 2023-06-27 **Note that this release bumps the WordPress minimum version from 5.7 to 6.1 and the PHP minimum version from 7.4 to 8.0.** diff --git a/convert-to-blocks.php b/convert-to-blocks.php index 3498d0e..40711c5 100644 --- a/convert-to-blocks.php +++ b/convert-to-blocks.php @@ -3,7 +3,7 @@ * Plugin Name: Convert to Blocks * Plugin URI: https://github.com/10up/convert-to-blocks * Description: Convert classic editor posts to blocks on the fly. - * Version: 1.2.0 + * Version: 1.2.1 * Requires at least: 6.1 * Requires PHP: 8 * Author: 10up diff --git a/package.json b/package.json index a395997..f8974da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "convert-to-blocks", - "version": "1.2.0", + "version": "1.2.1", "description": "Convert to Blocks is a WordPress plugin that transforms classic editor content to blocks on the fly.", "author": { "name": "10up", diff --git a/readme.txt b/readme.txt index 2672505..796a1fb 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: gutenberg, block, block migration, gutenberg migration, guten Requires at least: 5.7 Tested up to: 6.2 Requires PHP: 7.4 -Stable tag: 1.2.0 +Stable tag: 1.2.1 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -43,6 +43,9 @@ Nested / Inner Block support does not work with Gutenberg bundled with WordPress == Changelog == += 1.2.1 - 2023-06-28 = +* **Fixed** Parse error caused by a comma (props [@Sidsector9](https://github.com/Sidsector9) via [#123](https://github.com/10up/convert-to-blocks/pull/123)). + = 1.2.0 - 2023-06-27 = **Note that this release bumps the WordPress minimum version from 5.7 to 6.1 and the PHP minimum version from 7.4 to 8.0.** From e1e78546bdd05ba5cf00af43643f99b368bd8f66 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Mon, 24 Jul 2023 14:59:08 -0600 Subject: [PATCH 3/5] Simplify code --- includes/ConvertToBlocks/Settings.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/includes/ConvertToBlocks/Settings.php b/includes/ConvertToBlocks/Settings.php index 98c2d6f..5f18b21 100644 --- a/includes/ConvertToBlocks/Settings.php +++ b/includes/ConvertToBlocks/Settings.php @@ -254,11 +254,7 @@ public function filter_notice() { ?>

- +

Date: Mon, 24 Jul 2023 15:02:40 -0600 Subject: [PATCH 4/5] Update release date, version and changelog --- CHANGELOG.md | 5 ++--- package-lock.json | 4 ++-- readme.txt | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7144685..707f3b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,9 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD -## [1.2.1] - 2023-06-28 - +## [1.2.1] - 2023-07-25 ### Fixed -- Parse error caused by a comma (props [@Sidsector9](https://github.com/Sidsector9) via [#123](https://github.com/10up/convert-to-blocks/pull/123)). +- Parse error caused by a comma (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh), [@ravinderk](https://github.com/ravinderk), [@felipeelia](https://github.com/felipeelia) via [#123](https://github.com/10up/convert-to-blocks/pull/123)). ## [1.2.0] - 2023-06-27 **Note that this release bumps the WordPress minimum version from 5.7 to 6.1 and the PHP minimum version from 7.4 to 8.0.** diff --git a/package-lock.json b/package-lock.json index 7a429be..09deba9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "convert-to-blocks", - "version": "1.2.0", + "version": "1.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "convert-to-blocks", - "version": "1.2.0", + "version": "1.2.1", "license": "GPL-2.0-or-later", "devDependencies": { "@10up/cypress-wp-utils": "^0.1.0", diff --git a/readme.txt b/readme.txt index 796a1fb..c05dc7f 100644 --- a/readme.txt +++ b/readme.txt @@ -43,8 +43,8 @@ Nested / Inner Block support does not work with Gutenberg bundled with WordPress == Changelog == -= 1.2.1 - 2023-06-28 = -* **Fixed** Parse error caused by a comma (props [@Sidsector9](https://github.com/Sidsector9) via [#123](https://github.com/10up/convert-to-blocks/pull/123)). += 1.2.1 - 2023-07-25 = +* **Fixed** Parse error caused by a comma (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh), [@ravinderk](https://github.com/ravinderk), [@felipeelia](https://github.com/felipeelia) via [#123](https://github.com/10up/convert-to-blocks/pull/123)). = 1.2.0 - 2023-06-27 = **Note that this release bumps the WordPress minimum version from 5.7 to 6.1 and the PHP minimum version from 7.4 to 8.0.** From 4d6f1f24e11fb2257d8b4844d95b0272ece7018f Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Mon, 24 Jul 2023 15:10:35 -0600 Subject: [PATCH 5/5] Fix some workflows. Update CREDITS. Update another version number --- .github/workflows/lint.yml | 12 ++++++------ .github/workflows/test.yml | 4 ++-- CREDITS.md | 2 +- config.php | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 708726c..0e34077 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,11 +14,11 @@ jobs: name: eslint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: install node v12 - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - name: Install node + uses: actions/setup-node@v3 with: - node-version: 16 + node-version-file: '.nvmrc' - name: npm install run: npm install - name: eslint @@ -32,9 +32,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set PHP version - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: '7.4' coverage: none diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8162158..8405b31 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,12 +15,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - uses: getong/mariadb-action@v1.1 - name: Set PHP version - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: '7.4' coverage: none diff --git a/CREDITS.md b/CREDITS.md index 4c89a6a..75e4e3b 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -10,7 +10,7 @@ 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. -[Darshan Sawardekar (@dsawardekar)](https://github.com/dsawardekar), [Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Tyler Bailey (@TylerB24890)](https://github.com/TylerB24890), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Diana Padron](https://profiles.wordpress.org/dianapadron), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Brandon Berg (@BBerg10up)](https://github.com/BBerg10up), [Hashim Warren (@hashimwarren)](https://github.com/hashimwarren), [Jason LeMahieu (@MadtownLems)](https://github.com/MadtownLems), [Simon Carne](https://profiles.wordpress.org/scarne/), [Rodrigo Arias (@rodrigo-arias)](https://github.com/rodrigo-arias), [Gary Thayer (@gthayer)](https://github.com/gthayer), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Max Lyuchin (@cadic)](https://github.com/cadic), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Mohit Dadhich (@mohitwp)](https://github.com/mohitwp), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Andrew Norcross (@norcross)](https://github.com/norcross), [Quamruz Zaman (@zamanq)](https://github.com/zamanq), [Mehul Gohil (@mehul0810)](https://github.com/mehul0810), [Akshit Sethi (@akshitsethi)](https://github.com/akshitsethi), [Terrance Orletsky (@terrance-orletsky-d7)](https://github.com/terrance-orletsky-d7), [Philipp (@ouun)](https://github.com/ouun), [Sanket Parmar (@sanketio)](https://github.com/sanketio), [Konstantinos Galanakis (@kmgalanakis)](https://github.com/kmgalanakis), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Barney Jeffries(@barneyjeffries)](https://github.com/barneyjeffries). +[Darshan Sawardekar (@dsawardekar)](https://github.com/dsawardekar), [Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Tyler Bailey (@TylerB24890)](https://github.com/TylerB24890), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Diana Padron](https://profiles.wordpress.org/dianapadron), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Brandon Berg (@BBerg10up)](https://github.com/BBerg10up), [Hashim Warren (@hashimwarren)](https://github.com/hashimwarren), [Jason LeMahieu (@MadtownLems)](https://github.com/MadtownLems), [Simon Carne](https://profiles.wordpress.org/scarne/), [Rodrigo Arias (@rodrigo-arias)](https://github.com/rodrigo-arias), [Gary Thayer (@gthayer)](https://github.com/gthayer), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Max Lyuchin (@cadic)](https://github.com/cadic), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Mohit Dadhich (@mohitwp)](https://github.com/mohitwp), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Andrew Norcross (@norcross)](https://github.com/norcross), [Quamruz Zaman (@zamanq)](https://github.com/zamanq), [Mehul Gohil (@mehul0810)](https://github.com/mehul0810), [Akshit Sethi (@akshitsethi)](https://github.com/akshitsethi), [Terrance Orletsky (@terrance-orletsky-d7)](https://github.com/terrance-orletsky-d7), [Philipp (@ouun)](https://github.com/ouun), [Sanket Parmar (@sanketio)](https://github.com/sanketio), [Konstantinos Galanakis (@kmgalanakis)](https://github.com/kmgalanakis), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [Felipe Elia (@felipeelia)](https://github.com/felipeelia). ## Libraries diff --git a/config.php b/config.php index c627f47..fd81532 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ * @package convert-to-blocks */ -$plugin_version = '1.2.0'; +$plugin_version = '1.2.1'; if ( file_exists( __DIR__ . '/.commit' ) ) { // phpcs:disable