Skip to content

Commit

Permalink
Merge pull request #1754 from Codeinwp/next
Browse files Browse the repository at this point in the history
Next Branch
  • Loading branch information
HardeepAsrani authored Sep 18, 2023
2 parents afd2ede + e2d7306 commit 3f486b1
Show file tree
Hide file tree
Showing 97 changed files with 7,538 additions and 700 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ todo.md
artifacts
*.results.json
trace.json
license.json
license.json
.fleet
21 changes: 11 additions & 10 deletions .wp-env.override.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,23 @@
"config": {
"WP_DEBUG": true,
"WP_DEBUG_DISPLAY": true,
"FS_METHOD": "direct"
"FS_METHOD": "direct",
"WP_DEFAULT_THEME": "twentytwentythree"
},
"env": {
"development": {
"themes": [
"./one-theme"
]
},
"tests": {
"config": {
"WP_DEBUG": false,
"WP_DEBUG_DISPLAY": false
},
"plugins": [
"."
],
"mappings": {
"wp-content/mu-plugins": "./node_modules/@wordpress/e2e-tests/mu-plugins",
"wp-content/plugins/gutenberg-test-plugins": "./node_modules/@wordpress/e2e-tests/plugins"
}
"wp-content/mu-plugins": "./node_modules/@wordpress/e2e-tests/mu-plugins",
"wp-content/plugins/gutenberg-test-plugins": "./node_modules/@wordpress/e2e-tests/plugins",
"wp-content/themes/gutenberg-test-themes/twentytwentythree": "https://downloads.wordpress.org/theme/twentytwentythree.1.0.zip"
}
}
}
}
}
Binary file added assets/images/guide/welcome-ai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions blocks.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
"form-file": {
"block": "blocks/blocks/form/file/block.json"
},
"form-hidden-field": {
"block": "blocks/blocks/form/hidden-field/block.json"
},
"form-stripe-field": {
"block": "blocks/blocks/form/stripe-field/block.json"
},
"google-map": {
"block": "blocks/blocks/google-map/block.json",
"assets": {
Expand Down Expand Up @@ -272,5 +278,8 @@
"product-upsells": {
"isPro": true,
"block": "pro/woocommerce/upsells/block.json"
},
"content-generator": {
"block": "blocks/blocks/content-generator/block.json"
}
}
1 change: 1 addition & 0 deletions inc/class-main.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public function autoload_classes() {
'\ThemeIsle\GutenbergBlocks\Integration\Form_Providers',
'\ThemeIsle\GutenbergBlocks\Integration\Form_Email',
'\ThemeIsle\GutenbergBlocks\Server\Form_Server',
'\ThemeIsle\GutenbergBlocks\Server\Prompt_Server',
);

$classnames = apply_filters( 'otter_blocks_autoloader', $classnames );
Expand Down
21 changes: 11 additions & 10 deletions inc/class-registration.php
Original file line number Diff line number Diff line change
Expand Up @@ -498,16 +498,17 @@ function() {
'root' => esc_url_raw( rest_url() ),
'nonce' => wp_create_nonce( 'wp_rest' ),
'messages' => array(
'submission' => __( 'Form submission from', 'otter-blocks' ),
'captcha-not-loaded' => __( 'Captcha is not loaded. Please check your browser plugins to allow the Google reCaptcha.', 'otter-blocks' ),
'check-captcha' => __( 'Please check the captcha.', 'otter-blocks' ),
'invalid-email' => __( 'The email address is invalid!', 'otter-blocks' ),
'already-registered' => __( 'The email was already registered!', 'otter-blocks' ),
'try-again' => __( 'Error. Something is wrong with the server! Try again later.', 'otter-blocks' ),
'privacy' => __( 'I have read and agreed the privacy statement.', 'otter-blocks' ),
'too-many-files' => __( 'Too many files loaded. Maximum is: ', 'otter-blocks' ),
'big-file' => __( 'File size is to big. The limit is: ', 'otter-blocks' ),
'invalid-file' => __( 'Invalid files type. The submitted files could not be processed.', 'otter-blocks' ),
'submission' => __( 'Form submission from', 'otter-blocks' ),
'captcha-not-loaded' => __( 'Captcha is not loaded. Please check your browser plugins to allow the Google reCaptcha.', 'otter-blocks' ),
'check-captcha' => __( 'Please check the captcha.', 'otter-blocks' ),
'invalid-email' => __( 'The email address is invalid!', 'otter-blocks' ),
'already-registered' => __( 'The email was already registered!', 'otter-blocks' ),
'try-again' => __( 'Error. Something is wrong with the server! Try again later.', 'otter-blocks' ),
'privacy' => __( 'I have read and agreed the privacy statement.', 'otter-blocks' ),
'too-many-files' => __( 'Too many files loaded. Maximum is: ', 'otter-blocks' ),
'big-file' => __( 'File size is to big. The limit is: ', 'otter-blocks' ),
'invalid-file' => __( 'Invalid files type. The submitted files could not be processed.', 'otter-blocks' ),
'confirmingSubmission' => __( 'Confirming submission', 'otter-blocks' ),
),
)
);
Expand Down
Loading

0 comments on commit 3f486b1

Please sign in to comment.