Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 2.6.1 #2299

Merged
merged 35 commits into from
Mar 5, 2024
Merged

Release 2.6.1 #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a6e8a4c
Merge pull request #2283 from woocommerce/trunk
eason9487 Feb 27, 2024
159284b
Fix the mixed indentations for the .wp-env.json file.
eason9487 Feb 29, 2024
e6c03c1
Make test-data.php plugin have a directory and change to use `plugins…
eason9487 Feb 29, 2024
a12cef3
Add support for Google Analytics for WooCommerce version 2.0.0
martynmjones Feb 29, 2024
3a423a2
phpcs
martynmjones Feb 29, 2024
7ce9ef2
Catch other exceptions when accepting TOS
mikkamp Feb 29, 2024
f447512
Unit tests for mark_tos_accepted exceptions
mikkamp Feb 29, 2024
1cb9749
Validate token through external request
mikkamp Mar 1, 2024
ad755aa
Update tests for validating Jetpack token
mikkamp Mar 1, 2024
bdfa8f3
Update Jetpack composer packages
mikkamp Mar 1, 2024
341a11a
Reconnect Jetpack if already registered
mikkamp Mar 1, 2024
a6c57ff
Test Jetpack connect and reconnect
mikkamp Mar 1, 2024
cd80eeb
Rename Jetpack to WordPress.com connection
mikkamp Mar 1, 2024
97ff040
Replace WordPress.com disconnect with status
mikkamp Mar 1, 2024
c95a4cd
Update connection status
mikkamp Mar 1, 2024
fb8fdc8
Add WP reconnect button if connection failed
mikkamp Mar 1, 2024
d920e91
Fix typo
mikkamp Mar 1, 2024
0e1c28d
Allow WP reconnect from ConnectionTest
mikkamp Mar 1, 2024
d039b75
Consider `ga_gtag_enabled=yes` for WCGAI >= 2
tomalec Mar 1, 2024
8503d69
Merge pull request #2288 from woocommerce/update/global-site-tag-for-…
martynmjones Mar 1, 2024
a8d5400
Remove esc_js from gtag config
martynmjones Mar 1, 2024
f9a5637
Ignore OutputNotEscaped warning for gtag config output
martynmjones Mar 1, 2024
7ff8bfc
Add gtag consent mode v0 support
tomalec Mar 1, 2024
b953a5a
Merge pull request #2286 from woocommerce/dev/2175-fix-e2e-missing-te…
eason9487 Mar 4, 2024
22410df
Mention how to update the consent mode in runtime
tomalec Mar 4, 2024
de77d2b
Update WCGAI to GA4W branding
tomalec Mar 4, 2024
439ff3c
Merge pull request #2287 from woocommerce/update/global-site-tag-for-…
martynmjones Mar 4, 2024
119ed3b
Merge pull request #2290 from woocommerce/add/gtag-consent
tomalec Mar 4, 2024
11f1322
Rename connected state parameter
mikkamp Mar 5, 2024
d9bf454
Merge pull request #2289 from woocommerce/fix/2285-jetpack-account-ha…
mikkamp Mar 5, 2024
b93ea2f
Start `release/2.6.1`.
github-actions[bot] Mar 5, 2024
e3d0f1e
Remove older changelog
jorgemd24 Mar 5, 2024
8f075d2
woorelease: Product version bump update
jorgemd24 Mar 5, 2024
f07ed32
woorelease: Changelog update
jorgemd24 Mar 5, 2024
271f164
Update hooks documentation from branch.
github-actions[bot] Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .wp-env.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"phpVersion": "8.0",
"plugins": [
"phpVersion": "8.0",
"plugins": [
"https://github.com/WP-API/Basic-Auth/archive/master.zip",
"."
],
"mappings": {
"wp-cli.yml": "./tests/e2e/config/wp-cli.yml",
"wp-content/plugins/test-data.php": "./tests/e2e/bin/test-data.php"
},
"./tests/e2e/test-data",
"."
],
"mappings": {
"wp-cli.yml": "./tests/e2e/config/wp-cli.yml"
},
"lifecycleScripts": {
"afterStart": "./tests/e2e/bin/test-env-setup.sh",
"afterClean": "./tests/e2e/bin/test-env-setup.sh"
}
"afterStart": "./tests/e2e/bin/test-env-setup.sh",
"afterClean": "./tests/e2e/bin/test-env-setup.sh"
}
}
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ npm run -- wp-env run tests-cli -- wp wc update

- [Usage Tracking](./src/Tracking/README.md)
- [Hooks defined or used in GLA](./src/Hooks/README.md)
- [gtag consent mode](./docs/gtag-consent-mode.md)

<p align="center">
<br/><br/>
Expand Down
7 changes: 7 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
*** WooCommerce Google Listings and Ads Changelog ***

= 2.6.1 - 2024-03-05 =
* Add - Consider `ga_gtag_enabled=yes` for WCGAI >= 2.
* Add - Google Analytics consent mode support.
* Add - Support for Google Analytics for WooCommerce version 2.0.0 and above.
* Dev - Avoid the test-data plugin occasionally missing in the E2E test environment.
* Fix - Improve WordPress.com account handling.

= 2.6.0 - 2024-02-27 =
* Add - Support the new product editor (Product Block Editor).
* Dev - Fix the compatibility issue in starting E2E test environment due to the default charset change in MariaDB v11.3.1.
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"require": {
"php": ">=7.4",
"ext-json": "*",
"automattic/jetpack-autoloader": "^2.4",
"automattic/jetpack-config": "^1.4",
"automattic/jetpack-connection": "^1.40",
"automattic/jetpack-autoloader": "^3.0",
"automattic/jetpack-config": "^2.0",
"automattic/jetpack-connection": "^2.3",
"google/apiclient": "^2.15",
"google/apiclient-services": "~0.312",
"googleads/google-ads-php": "^19.2",
Expand Down
Loading
Loading