From fad0db6cc0cbf69709d09485d8f4a75f6b89b5ab Mon Sep 17 00:00:00 2001 From: Petr Sedlacek Date: Fri, 5 Jul 2024 22:06:33 +0200 Subject: [PATCH 1/7] Fix Breadcrumb NavXT breadcrumb rendering It was removed by mistake in ee748ab1469559c56dd26444089e0cf8646e7e36 --- inc/views/breadcrumbs.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/inc/views/breadcrumbs.php b/inc/views/breadcrumbs.php index 51acc67a4e..1f783378c3 100644 --- a/inc/views/breadcrumbs.php +++ b/inc/views/breadcrumbs.php @@ -162,6 +162,15 @@ public static function maybe_render_seo_breadcrumbs( $html_tag, $check = false ) } } + // Breadcrumb NavXT breadcrumbs + if ( function_exists( 'bcn_display' ) ) { + echo ''; + bcn_display(); + echo ''; + + return true; + } + return false; } From cb3ec00dcaf38c4af58d82a213e5f0e38071a71d Mon Sep 17 00:00:00 2001 From: selul Date: Thu, 8 Aug 2024 11:13:47 +0300 Subject: [PATCH 2/7] add multilanguage support for surveys --- assets/apps/dashboard/src/utils/survey.js | 1 + inc/admin/dashboard/main.php | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/assets/apps/dashboard/src/utils/survey.js b/assets/apps/dashboard/src/utils/survey.js index 044f35d6dc..aaa6fa04ac 100644 --- a/assets/apps/dashboard/src/utils/survey.js +++ b/assets/apps/dashboard/src/utils/survey.js @@ -34,6 +34,7 @@ if ('undefined' !== typeof window && 'undefined' !== typeof window.neveDash) { days_since_install: convertToCategory( window.neveDash.daysSinceInstall ), + language: window.neveDash.lang, license_status: window.neveDash?.license?.valid ?? 'invalid', free_version: window.neveDash?.version, pro_version: window.neveDash?.proPluginVersion, diff --git a/inc/admin/dashboard/main.php b/inc/admin/dashboard/main.php index e39e08f0b3..097497c709 100755 --- a/inc/admin/dashboard/main.php +++ b/inc/admin/dashboard/main.php @@ -410,6 +410,13 @@ private function get_localization() { if ( isset( $_GET['onboarding'] ) && $_GET['onboarding'] === 'yes' ) { $data['isOnboarding'] = true; } + $language = get_user_locale(); + $available_languages = [ + 'de_DE' => 'de', + 'de_DE_formal' => 'de', + ]; + $lang_code = isset( $available_languages[ $language ] ) ? 'de' : 'en'; + $data['lang'] = $lang_code; return $data; } From 98f58567cf215592d610e1813afc0dc88d3dbf91 Mon Sep 17 00:00:00 2001 From: selul Date: Thu, 8 Aug 2024 17:22:38 +0300 Subject: [PATCH 3/7] add docker compose migration --- bin/envs/down.sh | 2 +- bin/envs/init.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/envs/down.sh b/bin/envs/down.sh index 2bd14f6524..f0389ade09 100755 --- a/bin/envs/down.sh +++ b/bin/envs/down.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash export DOCKER_FILE=docker-compose.ci.yml -docker-compose -f $DOCKER_FILE down +docker compose -f $DOCKER_FILE down docker volume prune --force diff --git a/bin/envs/init.sh b/bin/envs/init.sh index 615d3168c9..a8b5b08307 100755 --- a/bin/envs/init.sh +++ b/bin/envs/init.sh @@ -17,10 +17,10 @@ fi export DOCKER_FILE=docker-compose.ci.yml # Bring stack up. -docker-compose -f $DOCKER_FILE up -d +docker compose -f $DOCKER_FILE up -d # Wait for mysql container to be ready. -while docker-compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root db check ; [ $? -ne 0 ]; do +while docker compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root db check ; [ $? -ne 0 ]; do echo "Waiting for db to be ready... " sleep 1 done @@ -28,4 +28,4 @@ done # Run setup echo "Setting up environment $WP_ENV" -docker-compose -f $DOCKER_FILE run --rm -u root cli bash -c "/var/www/html/bin/envs/cli-setup.sh $ZIP_URL $WP_VERSION $WP_ENV $SKIP_CACHE" +docker compose -f $DOCKER_FILE run --rm -u root cli bash -c "/var/www/html/bin/envs/cli-setup.sh $ZIP_URL $WP_VERSION $WP_ENV $SKIP_CACHE" From 465df7c625cb66c81b2290c5c152bcd161b1413e Mon Sep 17 00:00:00 2001 From: Shane Davis Date: Sat, 10 Aug 2024 15:44:12 -0700 Subject: [PATCH 4/7] Fix #4286 EDD Before Archive Hook --- taxonomy-download_category.php | 15 ++++++++------- taxonomy-download_tag.php | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/taxonomy-download_category.php b/taxonomy-download_category.php index 50d7ed350c..daebc258e0 100644 --- a/taxonomy-download_category.php +++ b/taxonomy-download_category.php @@ -15,15 +15,16 @@
+
">
+
Date: Mon, 12 Aug 2024 00:14:25 +0000 Subject: [PATCH 5/7] chore: Update Google fonts --- globals/google-fonts.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/globals/google-fonts.php b/globals/google-fonts.php index ebb79b0cf2..d643badadc 100644 --- a/globals/google-fonts.php +++ b/globals/google-fonts.php @@ -1,6 +1,6 @@ array( '400',), 'Mali' => array( '200', '300', '400', '500', '600', '700', '200italic', '300italic', '400italic', '500italic', '600italic', '700italic',), 'Mallanna' => array( '400',), + 'Maname' => array( '400',), 'Mandali' => array( '400',), 'Manjari' => array( '100', '400', '700',), 'Manrope' => array( '200', '300', '400', '500', '600', '700', '800',), @@ -1251,24 +1252,36 @@ 'Playfair Display' => array( '400', '500', '600', '700', '800', '900', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), 'Playfair Display SC' => array( '400', '700', '900', '400italic', '700italic', '900italic',), 'Playpen Sans' => array( '100', '200', '300', '400', '500', '600', '700', '800',), + 'Playwrite AR' => array( '100', '200', '300', '400',), + 'Playwrite AT' => array( '100', '200', '300', '400', '100italic', '200italic', '300italic', '400italic',), 'Playwrite AU NSW' => array( '100', '200', '300', '400',), 'Playwrite AU QLD' => array( '100', '200', '300', '400',), 'Playwrite AU SA' => array( '100', '200', '300', '400',), 'Playwrite AU TAS' => array( '100', '200', '300', '400',), 'Playwrite AU VIC' => array( '100', '200', '300', '400',), + 'Playwrite BE VLG' => array( '100', '200', '300', '400',), + 'Playwrite BE WAL' => array( '100', '200', '300', '400',), 'Playwrite BR' => array( '100', '200', '300', '400',), 'Playwrite CA' => array( '100', '200', '300', '400',), + 'Playwrite CL' => array( '100', '200', '300', '400',), 'Playwrite CO' => array( '100', '200', '300', '400',), + 'Playwrite CU' => array( '100', '200', '300', '400',), + 'Playwrite CZ' => array( '100', '200', '300', '400',), 'Playwrite DE Grund' => array( '100', '200', '300', '400',), 'Playwrite DE LA' => array( '100', '200', '300', '400',), 'Playwrite DE SAS' => array( '100', '200', '300', '400',), 'Playwrite DE VA' => array( '100', '200', '300', '400',), + 'Playwrite DK Loopet' => array( '100', '200', '300', '400',), + 'Playwrite DK Uloopet' => array( '100', '200', '300', '400',), 'Playwrite ES' => array( '100', '200', '300', '400',), 'Playwrite ES Deco' => array( '100', '200', '300', '400',), 'Playwrite FR Moderne' => array( '100', '200', '300', '400',), 'Playwrite FR Trad' => array( '100', '200', '300', '400',), 'Playwrite GB J' => array( '100', '200', '300', '400', '100italic', '200italic', '300italic', '400italic',), 'Playwrite GB S' => array( '100', '200', '300', '400', '100italic', '200italic', '300italic', '400italic',), + 'Playwrite HR' => array( '100', '200', '300', '400',), + 'Playwrite HR Lijeva' => array( '100', '200', '300', '400',), + 'Playwrite HU' => array( '100', '200', '300', '400',), 'Playwrite ID' => array( '100', '200', '300', '400',), 'Playwrite IE' => array( '100', '200', '300', '400',), 'Playwrite IN' => array( '100', '200', '300', '400',), @@ -1280,6 +1293,7 @@ 'Playwrite NL' => array( '100', '200', '300', '400',), 'Playwrite NO' => array( '100', '200', '300', '400',), 'Playwrite NZ' => array( '100', '200', '300', '400',), + 'Playwrite PE' => array( '100', '200', '300', '400',), 'Playwrite PL' => array( '100', '200', '300', '400',), 'Playwrite PT' => array( '100', '200', '300', '400',), 'Playwrite RO' => array( '100', '200', '300', '400',), From 47d278455a30c7413d2392cd5069ec8c428dcef3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:51:59 +0000 Subject: [PATCH 6/7] chore(deps): bump codeinwp/themeisle-sdk from 3.3.27 to 3.3.28 Bumps [codeinwp/themeisle-sdk](https://github.com/Codeinwp/themeisle-sdk) from 3.3.27 to 3.3.28. - [Release notes](https://github.com/Codeinwp/themeisle-sdk/releases) - [Changelog](https://github.com/Codeinwp/themeisle-sdk/blob/master/CHANGELOG.md) - [Commits](https://github.com/Codeinwp/themeisle-sdk/compare/v3.3.27...v3.3.28) --- updated-dependencies: - dependency-name: codeinwp/themeisle-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index a4294b1acd..35d551a3da 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "codeinwp/themeisle-sdk", - "version": "3.3.27", + "version": "3.3.28", "source": { "type": "git", "url": "https://github.com/Codeinwp/themeisle-sdk.git", - "reference": "ae9f1aae6e71677db5de1f579b2275be6fc838f4" + "reference": "cd35fd5356ba169b9a0419ba879764ffeb811b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/ae9f1aae6e71677db5de1f579b2275be6fc838f4", - "reference": "ae9f1aae6e71677db5de1f579b2275be6fc838f4", + "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/cd35fd5356ba169b9a0419ba879764ffeb811b63", + "reference": "cd35fd5356ba169b9a0419ba879764ffeb811b63", "shasum": "" }, "require-dev": { @@ -42,9 +42,9 @@ ], "support": { "issues": "https://github.com/Codeinwp/themeisle-sdk/issues", - "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.27" + "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.28" }, - "time": "2024-07-30T06:16:39+00:00" + "time": "2024-08-09T08:54:15+00:00" }, { "name": "wptt/webfont-loader", From 847919982e7e32a28350b168ff7cb788d629ad19 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Wed, 14 Aug 2024 15:41:48 +0530 Subject: [PATCH 7/7] fix: e2e background color picker issue --- e2e-tests/specs/customizer/general/custom-global-colors.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e-tests/specs/customizer/general/custom-global-colors.spec.ts b/e2e-tests/specs/customizer/general/custom-global-colors.spec.ts index 6a71257c4a..ea96ca0ff7 100644 --- a/e2e-tests/specs/customizer/general/custom-global-colors.spec.ts +++ b/e2e-tests/specs/customizer/general/custom-global-colors.spec.ts @@ -34,6 +34,7 @@ test.describe('Custom Global Color Control', () => { await clearWelcome(page); await page.locator('.block-editor-rich-text__editable').first().click(); + await page.locator('.block-editor-block-inspector__tab-item').last().click(); // use Background color control to open the color picker, available since WP 6.1 await page.getByRole('button', { name: 'Background' }).click(); await page.getByRole('option', { name: 'Color: Custom 1' }).click();