Skip to content

Commit 2df3f3f

Browse files
gmjuhaszmatticbot
authored andcommitted
Backport jetpack 15.4-a.3 changes (#46303)
* Changelog and readme.txt edits. * Update stable tag in readme.txt * Update projects/js-packages/charts/CHANGELOG.md Co-authored-by: Manzoor Wani <[email protected]> --------- Co-authored-by: Manzoor Wani <[email protected]> Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/20298026265 Upstream-Ref: Automattic/jetpack@5988af7
1 parent 4e388f4 commit 2df3f3f

File tree

6 files changed

+45
-37
lines changed

6 files changed

+45
-37
lines changed

CHANGELOG.md

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,47 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [7.0.0-alpha] - unreleased
8+
## [7.1.0-alpha] - unreleased
99

1010
This is an alpha version! The changes listed here are not final.
1111

12-
### Added
13-
- Add Jetpack Form custom post type for reusable forms with REST API support and feature flag integration
14-
- Forms: Add CTA to install/activate Akismet on empty spam dashboard
15-
1612
### Changed
17-
- Add jetpack_forms_extra_webhooks filter and include feedback ID in jetpack_forms_before_webhook_request filter
1813
- Allow CSV files to be uploaded via contact forms
19-
- Forms: auto-generate webhook id so users don't have to fill it.
20-
- Forms: refactored how we retrieve form submission fields to send in the webhook payload.
21-
- Forms: track webhook requests done in wpcom infrastructure.
22-
- Forms: track when users enable and disable webhooks.
23-
- Forms: use entire button area for selecting multi-select options
24-
- Replace use of confusing `esc_js` with `wp_json_encode`.
25-
- Tests: Replace PHPUnit mocks with anonymous classes to eliminate PHPUnit 12 strictness warnings
26-
- Update package dependencies.
2714

2815
### Removed
2916
- Forms: remove admin class files
30-
- Forms: Removes classic Admin initialization code
3117

3218
### Fixed
3319
- Fixed textarea placeholders to match input placeholder styling
34-
- Fix export functionality to handle null values properly for IP Address, Country code, and Browser fields
35-
- Fix `Contact_Form_Endpoint_Test::test_resend_email` attempting to actually send email.
36-
- Forms: ensure submission summary is contained within 100% width
37-
- Forms: Fix dashboard height
38-
- Forms: Fix slider field text labels showing borders in editor when using certain themes like Assembler
39-
- Forms: fix validation accessibility.
4020
- Forms: strip HTML from styled labels in error summary
41-
- Make form buttons take full width on mobile devices
21+
22+
## [7.0.0] - 2025-12-15
23+
### Added
24+
- Add Jetpack Form custom post type for reusable forms with REST API support and feature flag integration. [#46202]
25+
- Add CTA to install/activate Akismet on empty spam dashboard. [#46212]
26+
27+
### Changed
28+
- Add `jetpack_forms_extra_webhooks` filter and include feedback ID in `jetpack_forms_before_webhook_request` filter. [#46228]
29+
- Auto-generate webhook id so users don't have to fill it. [#46270]
30+
- Refactor how we retrieve form submission fields to send in the webhook payload. [#46201]
31+
- Track webhook requests done in wpcom infrastructure. [#46273]
32+
- Track when users enable and disable webhooks. [#46277]
33+
- Use entire button area for selecting multi-select options. [#46263]
34+
- Replace use of confusing `esc_js` with `wp_json_encode`. [#46229]
35+
- Tests: Replace PHPUnit mocks with anonymous classes to eliminate PHPUnit 12 strictness warnings. [#46256]
36+
- Update package dependencies. [#46244]
37+
38+
### Removed
39+
- Removes classic Admin initialization code. [#46254]
40+
41+
### Fixed
42+
- Fix export functionality to handle null values properly for IP Address, Country code, and Browser fields. [#46250]
43+
- Fix `Contact_Form_Endpoint_Test::test_resend_email` attempting to actually send email. [#46261]
44+
- Ensure submission summary is contained within 100% width. [#46264]
45+
- Fix dashboard height. [#46276]
46+
- Fix slider field text labels showing borders in editor when using certain themes like Assembler. [#46182]
47+
- Fix validation accessibility. [#46275]
48+
- Make form buttons take full width on mobile devices. [#46154]
4249

4350
## [6.22.0] - 2025-12-08
4451
### Added
@@ -1991,7 +1998,8 @@ This is an alpha version! The changes listed here are not final.
19911998
- Added a new jetpack/forms package [#28409]
19921999
- Added a public load_contact_form method for initializing the contact form module. [#28416]
19932000

1994-
[7.0.0-alpha]: https://github.com/automattic/jetpack-forms/compare/v6.22.0...v7.0.0-alpha
2001+
[7.1.0-alpha]: https://github.com/automattic/jetpack-forms/compare/v7.0.0...v7.1.0-alpha
2002+
[7.0.0]: https://github.com/automattic/jetpack-forms/compare/v6.22.0...v7.0.0
19952003
[6.22.0]: https://github.com/automattic/jetpack-forms/compare/v6.21.2...v6.22.0
19962004
[6.21.2]: https://github.com/automattic/jetpack-forms/compare/v6.21.1...v6.21.2
19972005
[6.21.1]: https://github.com/automattic/jetpack-forms/compare/v6.21.0...v6.21.1

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
"require": {
77
"php": ">=7.2",
88
"automattic/jetpack-blocks": "^3.1.1",
9-
"automattic/jetpack-assets": "^4.3.17-alpha",
10-
"automattic/jetpack-connection": "^6.19.12-alpha",
9+
"automattic/jetpack-assets": "^4.3.17",
10+
"automattic/jetpack-connection": "^6.19.12",
1111
"automattic/jetpack-device-detection": "^3.3.0",
12-
"automattic/jetpack-external-connections": "^0.1.9-alpha",
12+
"automattic/jetpack-external-connections": "^0.1.9",
1313
"automattic/jetpack-jwt": "^0.2.2",
1414
"automattic/jetpack-logo": "^3.0.5",
1515
"automattic/jetpack-plans": "^0.11.1",
16-
"automattic/jetpack-status": "^6.1.2-alpha",
17-
"automattic/jetpack-sync": "^4.24.1-alpha",
16+
"automattic/jetpack-status": "^6.1.2",
17+
"automattic/jetpack-sync": "^4.24.2-alpha",
1818
"automattic/jetpack-admin-ui": "^0.5.11"
1919
},
2020
"require-dev": {
2121
"yoast/phpunit-polyfills": "^4.0.0",
2222
"automattic/jetpack-changelogger": "^6.0.12",
23-
"automattic/jetpack-connection": "^6.19.12-alpha",
23+
"automattic/jetpack-connection": "^6.19.12",
2424
"automattic/jetpack-test-environment": "@dev",
2525
"automattic/phpunit-select-config": "^1.0.3",
2626
"automattic/wp-feature-api": "@dev"
@@ -64,7 +64,7 @@
6464
"link-template": "https://github.com/automattic/jetpack-forms/compare/v${old}...v${new}"
6565
},
6666
"branch-alias": {
67-
"dev-trunk": "7.0.x-dev"
67+
"dev-trunk": "7.1.x-dev"
6868
},
6969
"textdomain": "jetpack-forms",
7070
"version-constants": {

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@automattic/jetpack-forms",
3-
"version": "7.0.0-alpha",
3+
"version": "7.1.0-alpha",
44
"private": true,
55
"description": "Jetpack Forms",
66
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/forms/#readme",
@@ -36,10 +36,10 @@
3636
"dependencies": {
3737
"@automattic/babel-plugin-replace-textdomain": "^1.0.53",
3838
"@automattic/jetpack-analytics": "^1.0.6",
39-
"@automattic/jetpack-components": "^1.4.2-alpha",
40-
"@automattic/jetpack-connection": "^1.4.22",
39+
"@automattic/jetpack-components": "^1.4.3-alpha",
40+
"@automattic/jetpack-connection": "^1.4.23",
4141
"@automattic/jetpack-script-data": "^0.5.4",
42-
"@automattic/jetpack-shared-extension-utils": "^1.4.2-alpha",
42+
"@automattic/jetpack-shared-extension-utils": "^1.4.2",
4343
"@automattic/number-formatters": "^1.0.15",
4444
"@automattic/request-external-access": "1.0.1",
4545
"@automattic/ui": "1.0.2",

src/class-jetpack-forms.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
class Jetpack_Forms {
1616

17-
const PACKAGE_VERSION = '7.0.0-alpha';
17+
const PACKAGE_VERSION = '7.1.0-alpha';
1818

1919
/**
2020
* Load the contact form module.

src/contact-form/class-contact-form-plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1650,7 +1650,7 @@ public function process_form_submission() {
16501650
* }, 10, 2 );
16511651
* ```
16521652
*
1653-
* @since 7.0.0-alpha
1653+
* @since 7.0.0
16541654
*
16551655
* @param array $extra_webhooks Array of webhook configuration arrays. Default empty array.
16561656
* @param Contact_Form $form The form instance being processed.

src/service/class-form-webhooks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private function track_webhook_request( $status ) {
161161
/**
162162
* Fires when a webhook request is made, allowing stats tracking.
163163
*
164-
* @since 7.0.0-alpha
164+
* @since 7.0.0
165165
*
166166
* @param string $stat_group The stat group name.
167167
* @param string $status The status of the request: 'success', 'failed', or 'error'.

0 commit comments

Comments
 (0)