Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #4280

Merged
merged 13 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/apps/dashboard/src/utils/survey.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bin/envs/down.sh
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions bin/envs/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ 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

# 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"
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
16 changes: 15 additions & 1 deletion globals/google-fonts.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Updated on 01/07/24
* Updated on 12/08/24
*
* @package neve
*/
Expand Down Expand Up @@ -822,6 +822,7 @@
'Mako' => 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',),
Expand Down Expand Up @@ -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',),
Expand All @@ -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',),
Expand Down
7 changes: 7 additions & 0 deletions inc/admin/dashboard/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
9 changes: 9 additions & 0 deletions inc/views/breadcrumbs.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,15 @@ public static function maybe_render_seo_breadcrumbs( $html_tag, $check = false )
}
}

// Breadcrumb NavXT breadcrumbs
if ( function_exists( 'bcn_display' ) ) {
echo '<small class="neve-breadcrumbs-wrapper">';
bcn_display();
echo '</small>';

return true;
}

return false;
}

Expand Down
15 changes: 8 additions & 7 deletions taxonomy-download_category.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
<div id= "nv-edd-download-archive-container" class="<?php echo esc_attr( $container_class ); ?>">

<div id="wrapper">
<?php
/**
* Executes actions before the archive content.
*
* @since 3.0.0
*/
do_action( 'neve_before_download_archive' );
?>
<div id="nv-edd-grid-container">
<?php
/**
* Executes actions before the post content.
*
* @since 3.0.0
*/
do_action( 'neve_before_download_archive' );

if ( have_posts() ) {

while ( have_posts() ) {
Expand Down
15 changes: 8 additions & 7 deletions taxonomy-download_tag.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
<div id= "nv-edd-download-archive-container" class="<?php echo esc_attr( $container_class ); ?>">

<div id="wrapper">
<?php
/**
* Executes actions before the archive content.
*
* @since 3.0.0
*/
do_action( 'neve_before_download_archive' );
?>
<div id="nv-edd-grid-container">
<?php
/**
* Executes actions before the post content.
*
* @since 3.0.0
*/
do_action( 'neve_before_download_archive' );

if ( have_posts() ) {

while ( have_posts() ) {
Expand Down
Loading