Skip to content

Commit

Permalink
Merge branch 'develop' into add/features-module
Browse files Browse the repository at this point in the history
* develop: (25 commits)
  Composer(deps): Bump newfold-labs/wp-module-notifications
  Reorg deps
  Add notification with 'bluehost-app-nav' context in the app nav
  Composer(deps): Bump newfold-labs/wp-module-activation
  Composer(deps): Bump newfold-labs/wp-module-performance
  updating lock files
  Rename test file name
  Remove facebook module from composer packages
  fix border styles
  Change launchpad page slug
  ecommerce version bump to 1.3.28
  bug fixes
  fixing cypress test error
  cypress tests added
  coments addresed
  runtime version update and eslint fix
  update to products and desc
  lock files
  storepage
  redirection urls
  ...

# Conflicts:
#	composer.json
#	composer.lock
#	inc/Admin.php
  • Loading branch information
circlecube committed May 3, 2024
2 parents ade0916 + 0425cc2 commit 81a641c
Show file tree
Hide file tree
Showing 13 changed files with 1,174 additions and 1,475 deletions.
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@
"wp-phpunit/wp-phpunit": "^6.5.2"
},
"require": {
"newfold-labs/wp-module-activation": "^1.0.1",
"newfold-labs/wp-module-activation": "^1.0.2",
"newfold-labs/wp-module-coming-soon": "^1.2.3",
"newfold-labs/wp-module-context": "^1.0.0",
"newfold-labs/wp-module-data": "^2.4.24",
"newfold-labs/wp-module-deactivation": "^1.1.1",
"newfold-labs/wp-module-ecommerce": "^1.3.27",
"newfold-labs/wp-module-ecommerce": "^1.3.28",
"newfold-labs/wp-module-features": "dev-main",
"newfold-labs/wp-module-global-ctb": "^1.0.11",
"newfold-labs/wp-module-help-center": "^1.0.24",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.2.4",
"newfold-labs/wp-module-notifications": "^1.2.5",
"newfold-labs/wp-module-notifications": "^1.3.0",
"newfold-labs/wp-module-onboarding": "^2.1.9",
"newfold-labs/wp-module-patterns": "^0.1.18",
"newfold-labs/wp-module-performance": "^1.4.0",
"newfold-labs/wp-module-performance": "^1.4.1",
"newfold-labs/wp-module-runtime": "^1.0.10",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
"newfold-labs/wp-module-sso": "^1.0.5",
Expand Down
60 changes: 30 additions & 30 deletions composer.lock

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

4 changes: 4 additions & 0 deletions inc/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ public static function subpages() {
$home = array(
'bluehost#/home' => __( 'Home', 'wp-plugin-bluehost' ),
);
$pagesAndPosts = array(
'bluehost#/pages-and-posts' => __( 'Pages & Posts', 'wp-plugin-bluehost' ),
);
$store = array(
'bluehost#/store' => __( 'Store', 'wp-plugin-bluehost' ),
);
Expand Down Expand Up @@ -94,6 +97,7 @@ public static function subpages() {

return array_merge(
$home,
$pagesAndPosts,
$store,
$marketplace,
$performance,
Expand Down
Loading

0 comments on commit 81a641c

Please sign in to comment.