From 9b90aeffccfdf4eb58f0e23838a151d861ee2db6 Mon Sep 17 00:00:00 2001 From: "Soare Robert Daniel (Mac 2023)" Date: Tue, 20 Jun 2023 11:09:48 +0300 Subject: [PATCH 01/12] fix: null section id for Footer --- header-footer-grid/Core/Components/Abstract_FooterWidget.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header-footer-grid/Core/Components/Abstract_FooterWidget.php b/header-footer-grid/Core/Components/Abstract_FooterWidget.php index e5dd2b62ad..256ee6f585 100644 --- a/header-footer-grid/Core/Components/Abstract_FooterWidget.php +++ b/header-footer-grid/Core/Components/Abstract_FooterWidget.php @@ -32,7 +32,7 @@ abstract class Abstract_FooterWidget extends Abstract_Component { * @access public */ public function footer_widgets_show( $active, $section ) { - if ( strpos( $section->id, 'widgets-footer-' ) ) { + if ( isset( $section->id ) && strpos( $section->id, 'widgets-footer-' ) ) { $active = true; } From bc2727a234b768330d03f11f4b841d7e3c3e0f80 Mon Sep 17 00:00:00 2001 From: Bogdan Preda Date: Wed, 21 Jun 2023 13:23:43 +0300 Subject: [PATCH 02/12] fix: about page display when using whitelabel Codeinwp/neve-pro-addon#2539 --- inc/admin/dashboard/main.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inc/admin/dashboard/main.php b/inc/admin/dashboard/main.php index c2a735c917..e2144065b3 100755 --- a/inc/admin/dashboard/main.php +++ b/inc/admin/dashboard/main.php @@ -84,6 +84,10 @@ public function init() { add_action( 'admin_enqueue_scripts', [ $this, 'enqueue' ] ); add_action( 'init', array( $this, 'register_settings' ) ); + $theme = wp_get_theme(); + if ( $theme['name'] !== 'Neve' ) { + return; + } add_filter( 'neve_about_us_metadata', function () { From dcadfee30d492bbeba0c9a7bacff5adafc9a806b Mon Sep 17 00:00:00 2001 From: Bogdan Preda Date: Thu, 22 Jun 2023 12:56:36 +0300 Subject: [PATCH 03/12] fix: hook order for about page --- inc/admin/dashboard/main.php | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/inc/admin/dashboard/main.php b/inc/admin/dashboard/main.php index e2144065b3..4f1f61259c 100755 --- a/inc/admin/dashboard/main.php +++ b/inc/admin/dashboard/main.php @@ -83,14 +83,30 @@ public function init() { add_action( 'admin_menu', [ $this, 'register' ] ); add_action( 'admin_enqueue_scripts', [ $this, 'enqueue' ] ); add_action( 'init', array( $this, 'register_settings' ) ); + add_action( 'init', array( $this, 'register_about_page' ), 1 ); + } - $theme = wp_get_theme(); - if ( $theme['name'] !== 'Neve' ) { + /** + * Add the about page with respect to the white label settings. + * + * @return void + */ + public function register_about_page() { + $theme = wp_get_theme(); + $filtered_name = apply_filters( 'ti_wl_theme_name', $theme->__get( 'Name' ) ); + $slug = $theme->__get( 'stylesheet' ); + + if ( empty( $slug ) || empty( $filtered_name ) ) { + return; + } + + if ( $filtered_name !== 'Neve' ) { return; } + add_filter( 'neve_about_us_metadata', - function () { + function () use ( $filtered_name ) { return [ // Top-level page in the dashboard sidebar 'location' => 'neve-welcome', @@ -105,11 +121,10 @@ function () { 'has_upgrade_menu' => ! defined( 'NEVE_PRO_VERSION' ), // Upgrade menu item link & text 'upgrade_link' => tsdk_utmify( esc_url( 'https://themeisle.com/themes/neve/upgrade/' ), 'aboutfilter', 'nevedashboard' ), - 'upgrade_text' => __( 'Upgrade', 'neve' ) . ' ' . $this->theme_args['name'], + 'upgrade_text' => __( 'Upgrade', 'neve' ) . ' ' . $filtered_name, ]; } ); - } /** From 30ff906b68f9fff4c121fd04610033432eb2e62c Mon Sep 17 00:00:00 2001 From: Bogdan Preda Date: Thu, 22 Jun 2023 14:29:08 +0300 Subject: [PATCH 04/12] chore: tweak the condition to display the about page on child themes --- inc/admin/dashboard/main.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inc/admin/dashboard/main.php b/inc/admin/dashboard/main.php index 4f1f61259c..3a72e0626a 100755 --- a/inc/admin/dashboard/main.php +++ b/inc/admin/dashboard/main.php @@ -100,7 +100,10 @@ public function register_about_page() { return; } - if ( $filtered_name !== 'Neve' ) { + // We check if the name is different from the filtered name, + // if it is, the whitelabel is in use and we should not add the about page. + // this check allows for child themes to use the about page. + if ( $filtered_name !== $theme->__get( 'Name' ) ) { return; } From 90143ec966b948e66ae6350093f00b47ded5f140 Mon Sep 17 00:00:00 2001 From: Bogdan Preda Date: Fri, 23 Jun 2023 12:28:20 +0300 Subject: [PATCH 05/12] fix: am reported issue #4000 --- header-footer-grid/Core/Components/MenuIcon.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/header-footer-grid/Core/Components/MenuIcon.php b/header-footer-grid/Core/Components/MenuIcon.php index 0b36da3d0a..00f03c3a88 100644 --- a/header-footer-grid/Core/Components/MenuIcon.php +++ b/header-footer-grid/Core/Components/MenuIcon.php @@ -675,6 +675,9 @@ public function render_component() { * @return string */ public static function aria_expanded_behaviour( $only_click_attribute = false ) { + if ( neve_is_amp() ) { + return $only_click_attribute ? '' : 'aria-expanded="false"'; + } return ( $only_click_attribute ? '' : 'aria-expanded="false" ' ) . 'onclick="if(\'undefined\' !== typeof toggleAriaClick ) { toggleAriaClick() }"'; } From a60ab748979d297d86b88f0eaa32876a29272ee1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:04:48 +0000 Subject: [PATCH 06/12] chore(deps): bump codeinwp/themeisle-sdk from 3.3.0 to 3.3.1 Bumps [codeinwp/themeisle-sdk](https://github.com/Codeinwp/themeisle-sdk) from 3.3.0 to 3.3.1. - [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.0...v3.3.1) --- 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 bb01ee1efd..5a740b2c81 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "codeinwp/themeisle-sdk", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/Codeinwp/themeisle-sdk.git", - "reference": "68dc5d11c1d7a20a13f3ae730183f61ff309d574" + "reference": "efb66935e69935b21ad99b0e55484e611ce4549d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/68dc5d11c1d7a20a13f3ae730183f61ff309d574", - "reference": "68dc5d11c1d7a20a13f3ae730183f61ff309d574", + "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/efb66935e69935b21ad99b0e55484e611ce4549d", + "reference": "efb66935e69935b21ad99b0e55484e611ce4549d", "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.0" + "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.1" }, - "time": "2023-05-30T08:55:06+00:00" + "time": "2023-06-21T06:55:46+00:00" }, { "name": "wptt/webfont-loader", From 08beecaa629524da8b284ffafd7c9f3955f08c5a Mon Sep 17 00:00:00 2001 From: Bogdan Preda Date: Thu, 29 Jun 2023 16:09:16 +0300 Subject: [PATCH 07/12] fix: react sctipt loop #4022 --- assets/apps/dashboard/src/Components/Plugin/InstallActivate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/apps/dashboard/src/Components/Plugin/InstallActivate.js b/assets/apps/dashboard/src/Components/Plugin/InstallActivate.js index 16a607d6b7..d86ef2ba55 100644 --- a/assets/apps/dashboard/src/Components/Plugin/InstallActivate.js +++ b/assets/apps/dashboard/src/Components/Plugin/InstallActivate.js @@ -48,7 +48,7 @@ const InstallActivate = ({ useEffect(() => { setCustomLabels(labels); - }, [labels]); + }, []); const getLabel = (type) => { return progress || !buttonLabels.firstLabel From 88e1482bc27809f9d8350a3c56e3898e70809f91 Mon Sep 17 00:00:00 2001 From: "themeisle[bot]" Date: Mon, 10 Jul 2023 00:14:24 +0000 Subject: [PATCH 08/12] chore: Update Google fonts --- globals/google-fonts.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/globals/google-fonts.php b/globals/google-fonts.php index 4e3bfdeb97..1e37ce5448 100644 --- a/globals/google-fonts.php +++ b/globals/google-fonts.php @@ -1,6 +1,6 @@ array( '400',), 'Adamina' => array( '400',), 'Advent Pro' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900', '100italic', '200italic', '300italic', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), + 'Agdasima' => array( '400', '700',), 'Aguafina Script' => array( '400',), + 'Akatab' => array( '400', '500', '600', '700', '800', '900',), 'Akaya Kanadaka' => array( '400',), 'Akaya Telivigala' => array( '400',), 'Akronim' => array( '400',), @@ -31,7 +33,7 @@ 'Alegreya SC' => array( '400', '500', '700', '800', '900', '400italic', '500italic', '700italic', '800italic', '900italic',), 'Alegreya Sans' => array( '100', '300', '400', '500', '700', '800', '900', '100italic', '300italic', '400italic', '500italic', '700italic', '800italic', '900italic',), 'Alegreya Sans SC' => array( '100', '300', '400', '500', '700', '800', '900', '100italic', '300italic', '400italic', '500italic', '700italic', '800italic', '900italic',), - 'Aleo' => array( '300', '400', '700', '300italic', '400italic', '700italic',), + 'Aleo' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900', '100italic', '200italic', '300italic', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), 'Alex Brush' => array( '400',), 'Alexandria' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900',), 'Alfa Slab One' => array( '400',), @@ -134,6 +136,7 @@ 'BIZ UDPGothic' => array( '400', '700',), 'BIZ UDPMincho' => array( '400', '700',), 'Babylonica' => array( '400',), + 'Bacasime Antique' => array( '400',), 'Bad Script' => array( '400',), 'Bagel Fat One' => array( '400',), 'Bahiana' => array( '400',), @@ -178,6 +181,7 @@ 'Be Vietnam Pro' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900', '100italic', '200italic', '300italic', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), 'Beau Rivage' => array( '400',), 'Bebas Neue' => array( '400',), + 'Belanosima' => array( '400', '600', '700',), 'Belgrano' => array( '400',), 'Bellefair' => array( '400',), 'Belleza' => array( '400',), @@ -256,6 +260,7 @@ 'Cantarell' => array( '400', '700', '400italic', '700italic',), 'Cantata One' => array( '400',), 'Cantora One' => array( '400',), + 'Caprasimo' => array( '400',), 'Capriola' => array( '400',), 'Caramel' => array( '400',), 'Carattere' => array( '400',), @@ -931,7 +936,7 @@ 'Noto Sans Deseret' => array( '400',), 'Noto Sans Devanagari' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900',), 'Noto Sans Display' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900', '100italic', '200italic', '300italic', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), - 'Noto Sans Duployan' => array( '400',), + 'Noto Sans Duployan' => array( '400', '700',), 'Noto Sans Egyptian Hieroglyphs' => array( '400',), 'Noto Sans Elbasan' => array( '400',), 'Noto Sans Elymaic' => array( '400',), @@ -1083,6 +1088,7 @@ 'Noto Serif NP Hmong' => array( '400', '500', '600', '700',), 'Noto Serif Nyiakeng Puachue Hmong' => array(), 'Noto Serif Oriya' => array( '400', '500', '600', '700',), + 'Noto Serif Ottoman Siyaq' => array( '400',), 'Noto Serif SC' => array( '200', '300', '400', '500', '600', '700', '900',), 'Noto Serif Sinhala' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900',), 'Noto Serif TC' => array( '200', '300', '400', '500', '600', '700', '900',), @@ -1554,6 +1560,9 @@ 'Yomogi' => array( '400',), 'Yrsa' => array( '300', '400', '500', '600', '700', '300italic', '400italic', '500italic', '600italic', '700italic',), 'Ysabeau' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900', '100italic', '200italic', '300italic', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), + 'Ysabeau Infant' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900', '100italic', '200italic', '300italic', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), + 'Ysabeau Office' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900', '100italic', '200italic', '300italic', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), + 'Ysabeau SC' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900',), 'Yuji Boku' => array( '400',), 'Yuji Hentaigana Akari' => array(), 'Yuji Hentaigana Akebono' => array(), From bd20a58660e36cc3fc13990d092010666c6e4e3b Mon Sep 17 00:00:00 2001 From: Marius Cristea Date: Thu, 13 Jul 2023 12:51:25 +0300 Subject: [PATCH 09/12] [skip ci] update feature template --- .github/ISSUE_TEMPLATE/Feature_request.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/Feature_request.yml b/.github/ISSUE_TEMPLATE/Feature_request.yml index 7cafe3b84c..a634981323 100644 --- a/.github/ISSUE_TEMPLATE/Feature_request.yml +++ b/.github/ISSUE_TEMPLATE/Feature_request.yml @@ -19,3 +19,16 @@ body: description: Can you please specify the desired feature or improvement and how it resolves the problem mentioned? validations: required: false +- type: dropdown + id: doc-needed + attributes: + label: Will this feature require documentation? (Optional) + description: | + Does this feature require the creation or update of documentation? If you're unsure, feel free to skip this. + multiple: false + options: + - 'I dont know.' + - 'No.' + - 'Yes, it requires documentation.' + validations: + required: false \ No newline at end of file From c550ee58687b1e0d1dfc0bb2d7f4f3167b3fd264 Mon Sep 17 00:00:00 2001 From: Marius Cristea Date: Thu, 13 Jul 2023 12:51:27 +0300 Subject: [PATCH 10/12] [skip ci] update labeler --- .github/labeler.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index e1df1510e6..6445de24f2 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -2,4 +2,7 @@ regression: - '(Yes, this is a regression)' customer report: - - '(helpscout)' + - '(helpscout|wordpress.org/support)' + +doc-needed: + - '(Yes, it requires documentation.)' \ No newline at end of file From 90318debaa3eab5af0edcfdbf19afef4605d1519 Mon Sep 17 00:00:00 2001 From: Marius Cristea Date: Thu, 13 Jul 2023 12:51:29 +0300 Subject: [PATCH 11/12] [skip ci] update autolabeler workflow --- .github/workflows/issue-labeler.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/issue-labeler.yml b/.github/workflows/issue-labeler.yml index a3d380f9df..73283e313b 100644 --- a/.github/workflows/issue-labeler.yml +++ b/.github/workflows/issue-labeler.yml @@ -7,8 +7,8 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: github/issue-labeler@master #May not be the latest version + - uses: github/issue-labeler@master with: repo-token: "${{ secrets.BOT_TOKEN }}" enable-versioned-regex: 0 - configuration-path: .github/labeler.yml + configuration-path: .github/labeler.yml \ No newline at end of file From b2ef6545be3ff498317e351070429f317c5473ff Mon Sep 17 00:00:00 2001 From: "themeisle[bot]" Date: Mon, 17 Jul 2023 09:20:02 +0000 Subject: [PATCH 12/12] chore(release): 3.6.5 ##### [Version 3.6.5](https://github.com/Codeinwp/neve/compare/v3.6.4...v3.6.5) (2023-07-17) - [Fix] Deprecated notice in HFG Footer - [Fix] About page display when using Whitelabel - [Fix] AMP compatibility with Standard Template Mode - [Fix] React script loop on Starter Sites page - Update Google Fonts - Update SDK --- CHANGELOG.md | 9 +++++++++ functions.php | 2 +- package.json | 2 +- readme.md | 12 ++++++++++++ readme.txt | 12 ++++++++++++ style.css | 2 +- 6 files changed, 36 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f616487aa..d7c8e912b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +##### [Version 3.6.5](https://github.com/Codeinwp/neve/compare/v3.6.4...v3.6.5) (2023-07-17) + +- [Fix] Deprecated notice in HFG Footer +- [Fix] About page display when using Whitelabel +- [Fix] AMP compatibility with Standard Template Mode +- [Fix] React script loop on Starter Sites page +- Update Google Fonts +- Update SDK + ##### [Version 3.6.4](https://github.com/Codeinwp/neve/compare/v3.6.3...v3.6.4) (2023-06-16) - [Fix] reported error for non-admin diff --git a/functions.php b/functions.php index ecf3b93481..a72db5f68f 100644 --- a/functions.php +++ b/functions.php @@ -8,7 +8,7 @@ * @package Neve */ -define( 'NEVE_VERSION', '3.6.4' ); +define( 'NEVE_VERSION', '3.6.5' ); define( 'NEVE_INC_DIR', trailingslashit( get_template_directory() ) . 'inc/' ); define( 'NEVE_ASSETS_URL', trailingslashit( get_template_directory_uri() ) . 'assets/' ); define( 'NEVE_MAIN_DIR', get_template_directory() . '/' ); diff --git a/package.json b/package.json index c7be5f1dab..74d671d423 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "neve", "nicename": "Neve", - "version": "3.6.4", + "version": "3.6.5", "description": "Neve theme by ThemeIsle", "category": "themes", "author": "ThemeIsle ", diff --git a/readme.md b/readme.md index 03be8c6830..5ed438a6a5 100644 --- a/readme.md +++ b/readme.md @@ -19,6 +19,18 @@ Neve is distributed under the terms of the GNU GPLv2 or later ## Changelog ## +##### [Version 3.6.5](https://github.com/Codeinwp/neve/compare/v3.6.4...v3.6.5) (2023-07-17) + +- [Fix] Deprecated notice in HFG Footer +- [Fix] About page display when using Whitelabel +- [Fix] AMP compatibility with Standard Template Mode +- [Fix] React script loop on Starter Sites page +- Update Google Fonts +- Update SDK + + + + ##### [Version 3.6.4](https://github.com/Codeinwp/neve/compare/v3.6.3...v3.6.4) (2023-06-16) - [Fix] reported error for non-admin diff --git a/readme.txt b/readme.txt index af833e3515..fadb88b671 100644 --- a/readme.txt +++ b/readme.txt @@ -19,6 +19,18 @@ Neve is distributed under the terms of the GNU GPLv2 or later == Changelog == +##### [Version 3.6.5](https://github.com/Codeinwp/neve/compare/v3.6.4...v3.6.5) (2023-07-17) + +- [Fix] Deprecated notice in HFG Footer +- [Fix] About page display when using Whitelabel +- [Fix] AMP compatibility with Standard Template Mode +- [Fix] React script loop on Starter Sites page +- Update Google Fonts +- Update SDK + + + + ##### [Version 3.6.4](https://github.com/Codeinwp/neve/compare/v3.6.3...v3.6.4) (2023-06-16) - [Fix] reported error for non-admin diff --git a/style.css b/style.css index 29c39a9660..7bce245566 100644 --- a/style.css +++ b/style.css @@ -7,7 +7,7 @@ Tested up to: 6.2 Requires PHP: 7.0 Requires at least: 5.4 Description: Neve is a super fast, easily customizable, multi-purpose theme. It’s perfect for blogs, small business, startups, agencies, firms, e-commerce shops (WooCommerce storefront) as well as personal portfolio sites and most types of projects. A fully AMP optimized and responsive theme, Neve will load in mere seconds and adapt perfectly on any viewing device. While it is lightweight and has a minimalist design, the theme is highly extendable, it has a highly SEO optimized code, resulting in top rankings in Google search results. Neve works perfectly with Gutenberg and the most popular page builders (Elementor, Brizy, Beaver Builder, Visual Composer, SiteOrigin, Divi). Neve is also WooCommerce ready, responsive, RTL & translation ready. Look no further. Neve is the perfect theme for you! -Version: 3.6.4 +Version: 3.6.5 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: neve