Skip to content

Commit

Permalink
Merge branch 'develop' into update/onboarding
Browse files Browse the repository at this point in the history
  • Loading branch information
officiallygod authored Jun 5, 2024
2 parents 5c79ae5 + c17992e commit 292f45d
Show file tree
Hide file tree
Showing 11 changed files with 913 additions and 586 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
- '8.2'
- '8.3'
wpVersion:
- '6.2'
- '6.3'
- '6.4'
- '6.5'

steps:

Expand Down
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.5.2",
"core": "WordPress/WordPress#tags/6.5.3",
"config": {
"WP_DEBUG": true,
"WP_DEBUG_LOG": true,
Expand Down
4 changes: 2 additions & 2 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ module.exports = defineConfig({
}
}

// Exclude ecommerce tests for WordPress lower than 6.3 (6.2) or PHP lower than 7.4 (7.1, 7.2 and 7.3)
if ( semver.satisfies( config.env.wpSemverVersion, '<6.3.0' ) || semver.satisfies( config.env.phpSemverVersion, '<7.4.0' )) {
// Exclude ecommerce tests for WordPress lower than 6.4 (6.3 or 6.2) or PHP lower than 7.4 (7.1, 7.2 and 7.3)
if ( semver.satisfies( config.env.wpSemverVersion, '<6.4.0' ) || semver.satisfies( config.env.phpSemverVersion, '<7.4.0' )) {
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Site-Capabilities/**',
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js'
Expand Down
56 changes: 55 additions & 1 deletion languages/wp-plugin-hostgator-es_MX-hostgator-script.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"translation-revision-date": "2023-08-24 18:27",
"generator": "WP-CLI\/2.10.0",
"source": "build\/2.7.1\/index.js",
"source": "build\/2.8.0\/index.js",
"domain": "messages",
"locale_data": {
"messages": {
Expand Down Expand Up @@ -548,6 +548,60 @@
],
"Working\u2026": [
""
],
"Pages & Posts": [
""
],
"Payments": [
""
],
"Products": [
""
],
"Showcase physical and digital goods, product variations, and custom configurations.": [
""
],
"View all ": [
""
],
"Add New": [
""
],
"Blog Posts": [
""
],
"Add a new blog post or edit your existing posts.": [
""
],
"Bookings & Appointments": [
""
],
"Add your list of services, setup a booking calendar, and edit your bookings form.": [
""
],
"Your site is not live.": [
""
],
"Your site is live.": [
""
],
"Visitors to your site will see your \"Coming Soon\" page and not your actual site. Visit ": [
""
],
"\"Settings\"": [
""
],
" to set your site live.": [
""
],
"Visitors to your site will see all your publicly published pages.": [
""
],
"Site Pages": [
""
],
"Edit your homepage and other existing pages or add new pages to your site.": [
""
]
}
}
Expand Down
Loading

0 comments on commit 292f45d

Please sign in to comment.