Merge branch 'development' into feat/contribution_guidelines

.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

.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.)'

.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

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

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

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() . '/' );

globals/google-fonts.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Updated on 12/06/23
+ * Updated on 10/07/23
  *
  * @package neve
  */
@@ -16,7 +16,9 @@
 	'Actor' => 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(),

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;
 		}
 

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() }"';
 	}
 

inc/admin/dashboard/main.php

@@ -83,10 +83,33 @@ 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 );
+	}
+
+	/**
+	 * 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;
+		}
+
+		// 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;
+		}
 
 		add_filter(
 			'neve_about_us_metadata',
-			function () {
+			function () use ( $filtered_name ) {
 				return [
 					// Top-level page in the dashboard sidebar
 					'location'         => 'neve-welcome',
@@ -101,11 +124,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,
 				];
 			}
 		);
-
 	}
 
 	/**

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 <[email protected]>",

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

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

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