From 2ed421f411bad52b4c88a7b116c65997a40236e9 Mon Sep 17 00:00:00 2001 From: Enrico Battocchi Date: Thu, 19 Oct 2023 11:25:37 +0200 Subject: [PATCH 01/10] Sets the WordPress tested up to version to 6.4 --- readme.txt | 2 +- tests/unit/bootstrap.php | 2 +- wp-seo-main.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.txt b/readme.txt index 23438907800..85b88076940 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Donate link: https://yoa.st/1up License: GPLv3 License URI: http://www.gnu.org/licenses/gpl.html Tags: SEO, XML sitemap, Content analysis, Readability, Schema -Tested up to: 6.3 +Tested up to: 6.4 Stable tag: 21.4 Requires PHP: 7.2.5 diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php index 4538a077a9d..4fc6bfb17b0 100644 --- a/tests/unit/bootstrap.php +++ b/tests/unit/bootstrap.php @@ -36,7 +36,7 @@ define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' ); define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' ); -define( 'YOAST_SEO_WP_TESTED', '6.3.2' ); +define( 'YOAST_SEO_WP_TESTED', '6.4' ); define( 'YOAST_SEO_WP_REQUIRED', '6.2' ); if ( ! defined( 'WPSEO_NAMESPACES' ) ) { diff --git a/wp-seo-main.php b/wp-seo-main.php index 7b58f3505fd..87f6f3781fc 100644 --- a/wp-seo-main.php +++ b/wp-seo-main.php @@ -35,7 +35,7 @@ define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' ); define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' ); -define( 'YOAST_SEO_WP_TESTED', '6.3.2' ); +define( 'YOAST_SEO_WP_TESTED', '6.4' ); define( 'YOAST_SEO_WP_REQUIRED', '6.2' ); if ( ! defined( 'WPSEO_NAMESPACES' ) ) { From 13c136e2356ff7f20c8e98ba700dc72c90ab8f36 Mon Sep 17 00:00:00 2001 From: manuelaugustin Date: Thu, 19 Oct 2023 13:13:30 +0200 Subject: [PATCH 02/10] Update readme.txt --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 85b88076940..246f1d698c2 100644 --- a/readme.txt +++ b/readme.txt @@ -366,7 +366,7 @@ Release date: 2023-10-31 * Adds indexation exclusion for Gutenberg Patterns taxonomy. * Improves the FAQ block description by removing any reference to the previous restriction of one block per post. -* Improves the inline documentation for the `WPSEO_Option` class. Props to @costdev. +* Improves the inline documentation for the `WPSEO_Option` class. Props to [costdev](https://github.com/costdev). * Leverages Script Strategy feature to add the async attribute to the `wordproof` script in case WordPress version is 6.3 or higher. Props to [adamsilverstein](https://github.com/adamsilverstein). = 21.4 = From 74353ce46a03803be5b1ad5d714578f61acad263 Mon Sep 17 00:00:00 2001 From: manuelaugustin Date: Thu, 19 Oct 2023 16:40:06 +0200 Subject: [PATCH 03/10] Update readme.txt --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 246f1d698c2..ab987d7fc1b 100644 --- a/readme.txt +++ b/readme.txt @@ -360,7 +360,7 @@ Release date: 2023-10-31 #### Bugfixes -* Specifies the correct prop type for props that can contain an interpolated string. +* Fixes a bug where console warnings about incorrect prop types would be shown on the integrations page. #### Other From 99aeca8e50c2c4ec51c8503b40ed77701e2e6262 Mon Sep 17 00:00:00 2001 From: Paolo Luigi Scala Date: Tue, 24 Oct 2023 12:21:38 +0200 Subject: [PATCH 04/10] Fix scrollable upsell modal. * The max-width has been increased (before it was the Wordpress default) * We now use the WordPress heading bottom border instead of adding our own --- css/src/modal.css | 5 +++++ packages/js/src/components/UpsellBox.js | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/css/src/modal.css b/css/src/modal.css index 714ac12d7ec..19993dd31a5 100644 --- a/css/src/modal.css +++ b/css/src/modal.css @@ -64,6 +64,7 @@ @media (min-width: 600px) { border-radius: 8px; + max-height: calc( 100% - 48px ); } } @@ -80,6 +81,10 @@ margin: 0; } +.yoast-gutenberg-modal .components-modal__content.has-scrolled-content:not(.hide-header) .components-modal__header { + border-bottom-color: #e2e8f0; +} + .yoast-gutenberg-modal .components-modal__icon-container { display: inline-flex; } diff --git a/packages/js/src/components/UpsellBox.js b/packages/js/src/components/UpsellBox.js index 1340bf12617..6fc8bd6e47a 100644 --- a/packages/js/src/components/UpsellBox.js +++ b/packages/js/src/components/UpsellBox.js @@ -117,7 +117,6 @@ class UpsellBox extends Component { const price = newPrice ? newPrice : defaultPrice; return ( -
{ isBlackFriday &&
{ __( "BLACK FRIDAY", "wordpress-seo" ) }
From c7fc4f6fbb11d977a9567d092dbb5889973c320f Mon Sep 17 00:00:00 2001 From: Paolo Luigi Scala Date: Tue, 24 Oct 2023 12:28:02 +0200 Subject: [PATCH 05/10] Revert "Fix scrollable upsell modal." This reverts commit 99aeca8e50c2c4ec51c8503b40ed77701e2e6262. --- css/src/modal.css | 5 ----- packages/js/src/components/UpsellBox.js | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/css/src/modal.css b/css/src/modal.css index 19993dd31a5..714ac12d7ec 100644 --- a/css/src/modal.css +++ b/css/src/modal.css @@ -64,7 +64,6 @@ @media (min-width: 600px) { border-radius: 8px; - max-height: calc( 100% - 48px ); } } @@ -81,10 +80,6 @@ margin: 0; } -.yoast-gutenberg-modal .components-modal__content.has-scrolled-content:not(.hide-header) .components-modal__header { - border-bottom-color: #e2e8f0; -} - .yoast-gutenberg-modal .components-modal__icon-container { display: inline-flex; } diff --git a/packages/js/src/components/UpsellBox.js b/packages/js/src/components/UpsellBox.js index 6fc8bd6e47a..1340bf12617 100644 --- a/packages/js/src/components/UpsellBox.js +++ b/packages/js/src/components/UpsellBox.js @@ -117,6 +117,7 @@ class UpsellBox extends Component { const price = newPrice ? newPrice : defaultPrice; return ( +
{ isBlackFriday &&
{ __( "BLACK FRIDAY", "wordpress-seo" ) }
From a90390d60da4c9a32187df44e2ba716c705b262e Mon Sep 17 00:00:00 2001 From: Paolo Luigi Scala Date: Tue, 24 Oct 2023 12:32:51 +0200 Subject: [PATCH 06/10] Fix scrollable upsell modal. * The max-width has been increased (before it was the Wordpress default) * We now use the WordPress heading bottom border instead of adding our own --- css/src/modal.css | 5 +++++ packages/js/src/components/UpsellBox.js | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/css/src/modal.css b/css/src/modal.css index 714ac12d7ec..19993dd31a5 100644 --- a/css/src/modal.css +++ b/css/src/modal.css @@ -64,6 +64,7 @@ @media (min-width: 600px) { border-radius: 8px; + max-height: calc( 100% - 48px ); } } @@ -80,6 +81,10 @@ margin: 0; } +.yoast-gutenberg-modal .components-modal__content.has-scrolled-content:not(.hide-header) .components-modal__header { + border-bottom-color: #e2e8f0; +} + .yoast-gutenberg-modal .components-modal__icon-container { display: inline-flex; } diff --git a/packages/js/src/components/UpsellBox.js b/packages/js/src/components/UpsellBox.js index 1340bf12617..6fc8bd6e47a 100644 --- a/packages/js/src/components/UpsellBox.js +++ b/packages/js/src/components/UpsellBox.js @@ -117,7 +117,6 @@ class UpsellBox extends Component { const price = newPrice ? newPrice : defaultPrice; return ( -
{ isBlackFriday &&
{ __( "BLACK FRIDAY", "wordpress-seo" ) }
From 50c5a7077350a5b4c5e1407e2758fa635d006cda Mon Sep 17 00:00:00 2001 From: "Paolo L. Scala" <68744851+pls78@users.noreply.github.com> Date: Tue, 24 Oct 2023 14:49:30 +0200 Subject: [PATCH 07/10] Update css/src/modal.css Co-authored-by: Igor <35524806+igorschoester@users.noreply.github.com> --- css/src/modal.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/src/modal.css b/css/src/modal.css index 19993dd31a5..98ba438b8e1 100644 --- a/css/src/modal.css +++ b/css/src/modal.css @@ -81,8 +81,8 @@ margin: 0; } -.yoast-gutenberg-modal .components-modal__content.has-scrolled-content:not(.hide-header) .components-modal__header { - border-bottom-color: #e2e8f0; +.yoast-gutenberg-modal .components-modal__content .components-modal__header { + border-bottom-color: #e2e8f0 !important; } .yoast-gutenberg-modal .components-modal__icon-container { From 810e900af6b542dc859740ec10018afc1c3a62a2 Mon Sep 17 00:00:00 2001 From: YoastBot Date: Tue, 24 Oct 2023 13:09:41 +0000 Subject: [PATCH 08/10] Add changelog --- readme.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/readme.txt b/readme.txt index ab987d7fc1b..e15c962e1cf 100644 --- a/readme.txt +++ b/readme.txt @@ -348,19 +348,11 @@ Release date: 2023-10-31 * Adds support for the new `wp_attachment_pages_enabled` option introduced by WordPress 6.4, reducing the chances of inconsistencies with Yoast SEO's own \"Enable media pages\" setting. * Improves the _inclusive language_ analysis by making the feedback more clear and consistent, refining the list of targeted phrases, and adding more alternatives for some of the non-inclusive phrases. Specifically, this includes the following changes: - * Aligns the traffic light color and written feedback for all phrases. - * Makes some feedback strings more accurate by replacing the word ‘overgeneralizing’ with ‘harmful’. - * Adds ‘Rom’ and ‘Roma’ as additional alternatives to ‘gypsy’. - * Adds additional alternatives to ‘homosexuals’. - * Improves the feedback shown for the phrases ‘abnormal behaviour’, ‘behaviourally normal’, and ‘behaviourally abnormal’. - * Improves the feedback shown for the word ‘minorities’. - * Removes ‘narcissistic’ as a targeted phrase when followed by ‘personality disorder’. - * Removes ‘Ebonics’ and ‘normal behaviour’ from the list of targeted phrases. * Removes the automatic `rel=nofollow` attribute for links in the RSS feed. #### Bugfixes -* Fixes a bug where console warnings about incorrect prop types would be shown on the integrations page. +* Fixes a bug where console warnings about incorrect prop types would be shown on the integrations page. #### Other @@ -368,6 +360,7 @@ Release date: 2023-10-31 * Improves the FAQ block description by removing any reference to the previous restriction of one block per post. * Improves the inline documentation for the `WPSEO_Option` class. Props to [costdev](https://github.com/costdev). * Leverages Script Strategy feature to add the async attribute to the `wordproof` script in case WordPress version is 6.3 or higher. Props to [adamsilverstein](https://github.com/adamsilverstein). +* Sets the WordPress tested up to version to 6.4. = 21.4 = From 12aa01767af4407c98dfeb0a2981476be9b578cc Mon Sep 17 00:00:00 2001 From: YoastBot Date: Tue, 24 Oct 2023 13:09:47 +0000 Subject: [PATCH 09/10] Bump version to 21.5-RC3 --- package.json | 2 +- wp-seo-main.php | 2 +- wp-seo.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b616d41a26d..97b608e0254 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "typescript": "^4.2.4" }, "yoast": { - "pluginVersion": "21.5-RC2" + "pluginVersion": "21.5-RC3" }, "version": "0.0.0" } diff --git a/wp-seo-main.php b/wp-seo-main.php index 87f6f3781fc..ccfe2889477 100644 --- a/wp-seo-main.php +++ b/wp-seo-main.php @@ -15,7 +15,7 @@ * {@internal Nobody should be able to overrule the real version number as this can cause * serious issues with the options, so no if ( ! defined() ).}} */ -define( 'WPSEO_VERSION', '21.5-RC2' ); +define( 'WPSEO_VERSION', '21.5-RC3' ); if ( ! defined( 'WPSEO_PATH' ) ) { diff --git a/wp-seo.php b/wp-seo.php index 851f64c1f6d..146d3cd7c56 100644 --- a/wp-seo.php +++ b/wp-seo.php @@ -8,7 +8,7 @@ * * @wordpress-plugin * Plugin Name: Yoast SEO - * Version: 21.5-RC2 + * Version: 21.5-RC3 * Plugin URI: https://yoa.st/1uj * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more. * Author: Team Yoast From 93b4a9dd7a6166e76e4897fd20b045fce2148f3b Mon Sep 17 00:00:00 2001 From: Igor <35524806+igorschoester@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:27:30 +0200 Subject: [PATCH 10/10] Fix changelog --- readme.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/readme.txt b/readme.txt index e15c962e1cf..b3aa22aad99 100644 --- a/readme.txt +++ b/readme.txt @@ -348,6 +348,14 @@ Release date: 2023-10-31 * Adds support for the new `wp_attachment_pages_enabled` option introduced by WordPress 6.4, reducing the chances of inconsistencies with Yoast SEO's own \"Enable media pages\" setting. * Improves the _inclusive language_ analysis by making the feedback more clear and consistent, refining the list of targeted phrases, and adding more alternatives for some of the non-inclusive phrases. Specifically, this includes the following changes: + * Aligns the traffic light color and written feedback for all phrases. + * Makes some feedback strings more accurate by replacing the word ‘overgeneralizing’ with ‘harmful’. + * Adds ‘Rom’ and ‘Roma’ as additional alternatives to ‘gypsy’. + * Adds additional alternatives to ‘homosexuals’. + * Improves the feedback shown for the phrases ‘abnormal behaviour’, ‘behaviourally normal’, and ‘behaviourally abnormal’. + * Improves the feedback shown for the word ‘minorities’. + * Removes ‘narcissistic’ as a targeted phrase when followed by ‘personality disorder’. + * Removes ‘Ebonics’ and ‘normal behaviour’ from the list of targeted phrases. * Removes the automatic `rel=nofollow` attribute for links in the RSS feed. #### Bugfixes