Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
* main:
  roll back coming soon and ecommerce module updates
  Update wp-module-onboarding and wp-module-onboarding-data
  i18n file update
  update modules
  update plugin version to 3.15.5
  update to WP 6.7.1

# Conflicts:
#	composer.json
#	composer.lock
  • Loading branch information
circlecube committed Nov 22, 2024
2 parents f2d5a7b + 2d6179d commit 26f111f
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 101 deletions.
2 changes: 1 addition & 1 deletion .wp-env.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"core": "WordPress/WordPress#tags/6.7",
"core": "WordPress/WordPress#tags/6.7.1",
"config": {
"WP_DEBUG": true,
"WP_DEBUG_LOG": true,
Expand Down
6 changes: 3 additions & 3 deletions bluehost-wordpress-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
* Plugin URI: https://bluehost.com
* Update URI: https://github.com/bluehost/bluehost-wordpress-plugin
* Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features.
* Version: 3.15.4
* Version: 3.15.5
* Requires at least: 6.5
* Requires PHP: 7.3
* Tested up to: 6.7
* Tested up to: 6.7.1
* Author: Bluehost
* Author URI: https://bluehost.com
* Text Domain: wp-plugin-bluehost
Expand All @@ -32,7 +32,7 @@
}

// Define constants
define( 'BLUEHOST_PLUGIN_VERSION', '3.15.4' );
define( 'BLUEHOST_PLUGIN_VERSION', '3.15.5' );
define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"newfold-labs/wp-php-standards": "^1.2.4",
"roave/security-advisories": "dev-latest",
"wp-cli/i18n-command": "^2.6.3",
"wp-phpunit/wp-phpunit": "^6.7.0"
"wp-phpunit/wp-phpunit": "^6.7.1"
},
"require": {
"newfold-labs/wp-module-activation": "^1.0.5",
Expand All @@ -88,9 +88,9 @@
"newfold-labs/wp-module-marketplace": "^2.4.0",
"newfold-labs/wp-module-migration": "^1.0.12",
"newfold-labs/wp-module-notifications": "^1.6.6",
"newfold-labs/wp-module-onboarding": "^2.5.4",
"newfold-labs/wp-module-onboarding-data": "^1.2.3",
"newfold-labs/wp-module-patterns": "^2.7.1",
"newfold-labs/wp-module-onboarding": "^2.5.5",
"newfold-labs/wp-module-onboarding-data": "^1.2.4",
"newfold-labs/wp-module-patterns": "^2.8.0",
"newfold-labs/wp-module-performance": "^2.0.1",
"newfold-labs/wp-module-pls": "^1.0.0",
"newfold-labs/wp-module-runtime": "^1.0.12",
Expand Down
50 changes: 25 additions & 25 deletions composer.lock

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

Loading

0 comments on commit 26f111f

Please sign in to comment.