Skip to content

Commit

Permalink
Merge pull request #438 from newfold-labs/release/2.6.3
Browse files Browse the repository at this point in the history
Release/2.6.3
  • Loading branch information
wpscholar authored Feb 2, 2024
2 parents 6e9f4ed + 392d38b commit 05b1565
Show file tree
Hide file tree
Showing 31 changed files with 1,511 additions and 683 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cypress-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ jobs:
echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x
cache: 'npm'

- name: Get Composer cache directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cypress-tests-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
mkdir dist
echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x
cache: 'npm'

- name: Get Composer cache directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cypress-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ jobs:
echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Get npm cache directory
id: npm-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/satis-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_OUTPUT

- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.WEBHOOK_TOKEN }}
repository: newfold-labs/satis
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upload-artifact-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ jobs:
echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Get npm cache directory
id: npm-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upload-asset-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ jobs:
echo "DIST=${PWD}/dist" >> $GITHUB_OUTPUT
echo "PACKAGE=${REPO##*/}" >> $GITHUB_OUTPUT
- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Get npm cache directory
id: npm-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wp-i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20.x

- name: Log debug information
run: |
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16
v20
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.4.2",
"core": "WordPress/WordPress#tags/6.4.3",
"config": {
"WP_DEBUG": true,
"WP_DEBUG_LOG": true,
Expand Down
10 changes: 10 additions & 0 deletions assets/styles/coming-soon.css
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,14 @@ footer p a:hover {
.subscription_widget form .inputs.submit input[type="submit"]:hover {
background-color: #2E93EE;
transition: all 0.1s ease;
}

.comingsoon_links {
font-size:13px;
}

.comingsoon_links a {
text-decoration: none;
line-height: 18px;
color: #3575D3;
}
13 changes: 13 additions & 0 deletions bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,26 @@ function () {
array( 'browser', 'file', 'skip404' )
);

$website_guide_link = 'https://www.hostgator.com/blog/build-wordpress-website-guide/';
$migrate_link = 'https://www.hostgator.com/help/article/hostgator-website-migration';
$hosting_link = 'https://www.hostgator.com/blog/reasons-why-wordpress-website/';

// Set coming soon values
$nfd_module_container->set(
'comingsoon',
array(
'admin_app_url' => admin_url( 'admin.php?page=hostgator#/home' ),
'template_h1' => __( 'A New WordPress Site', 'wp-plugin-hostgator' ),
'template_h2' => __( 'Coming Soon!', 'wp-plugin-hostgator' ),
'template_coming_soon_links' => sprintf(
esc_html__( ' %1$sHow to build your WordPress Website%2$s %3$sHow to Migrate a Website to Hostgator?%4$s %5$sWhy choose HostGator for your WordPress site?%6$s', 'wp-plugin-bluehost' ) . ' ',
'<a href="' . esc_url( $website_guide_link ) . '" target="_blank" rel="noopener noreferrer nofollow">',
'</a><span class="dashicons dashicons-wordpress"></span><br/>',
'<a href="' . esc_url( $migrate_link ) . '" target="_blank" rel="noopener noreferrer nofollow">',
'</a><br/>',
'<a href="' . esc_url( $hosting_link ) . '" target="_blank" rel="noopener noreferrer nofollow">',
'</a><br/> '
),
'template_footer_t' => sprintf(
/* translators: %1$s is replaced with opening link tag taking you to hostgator.com/wordpress, %2$s is replaced with closing link tag, %3$s is replaced with opening link tag taking you to login page, %4$s is replaced with closing link tag, %5$s is replaced with opening link tag taking you to portal.hostgator.com, %6$s is replaced with closing link tag */
esc_html__( 'A %1$sHostGator%2$s powered website. Is this your website? Log in to %3$sWordPress%4$s or %5$sHostgator%6$s.', 'wp-plugin-hostgator' ) . '&nbsp;',
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,20 @@
},
"require": {
"doctrine/inflector": "1.4.4 as 1.3.1",
"newfold-labs/wp-module-coming-soon": "^1.1.18",
"newfold-labs/wp-module-coming-soon": "^1.2.0",
"newfold-labs/wp-module-data": "^2.4.18",
"newfold-labs/wp-module-deactivation": "^1.0.4",
"newfold-labs/wp-module-ecommerce": "v1.3.18",
"newfold-labs/wp-module-global-ctb": "^1.0.9",
"newfold-labs/wp-module-help-center": "^1.0.22",
"newfold-labs/wp-module-ecommerce": "^v1.3.21",
"newfold-labs/wp-module-global-ctb": "^1.0.10",
"newfold-labs/wp-module-help-center": "^1.0.23",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.2.0",
"newfold-labs/wp-module-notifications": "^1.2.2",
"newfold-labs/wp-module-onboarding": "^1.12.0",
"newfold-labs/wp-module-marketplace": "^2.2.1",
"newfold-labs/wp-module-notifications": "^1.2.3",
"newfold-labs/wp-module-onboarding": "^1.12.1",
"newfold-labs/wp-module-patterns": "^0.1.13",
"newfold-labs/wp-module-performance": "^1.3.0",
"newfold-labs/wp-module-runtime": "^1.0.7",
"newfold-labs/wp-module-secure-passwords": "^1.1",
"newfold-labs/wp-module-runtime": "^1.0.9",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
"newfold-labs/wp-module-sso": "^1.0.4",
"newfold-labs/wp-module-staging": "^1.2.3",
"wp-forge/wp-update-handler": "^1.0",
Expand Down
Loading

0 comments on commit 05b1565

Please sign in to comment.