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

merged 35 commits into from
Mar 5, 2024

Commits on Feb 27, 2024

  1. Merge pull request #2283 from woocommerce/trunk 

    Release 2.6.0 - Merge `trunk` to `develop`
    @eason9487
    eason9487 authored Feb 27, 2024
    Configuration menu
    Copy the full SHA
    a6e8a4c View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Fix the mixed indentations for the .wp-env.json file.

    @eason9487
    eason9487 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    159284b View commit details
    Browse the repository at this point in the history

  2. Make test-data.php plugin have a directory and change to use `plugins… 

    …` directive to set up it.
    @eason9487
    eason9487 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    e6c03c1 View commit details
    Browse the repository at this point in the history

  3. Add support for Google Analytics for WooCommerce version 2.0.0

    @martynmjones
    martynmjones committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    a12cef3 View commit details
    Browse the repository at this point in the history

  4. phpcs

    @martynmjones
    martynmjones committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    3a423a2 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Catch other exceptions when accepting TOS

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    7ce9ef2 View commit details
    Browse the repository at this point in the history

  2. Unit tests for mark_tos_accepted exceptions

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f447512 View commit details
    Browse the repository at this point in the history

  3. Validate token through external request

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    1cb9749 View commit details
    Browse the repository at this point in the history

  4. Update tests for validating Jetpack token

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    ad755aa View commit details
    Browse the repository at this point in the history

  5. Update Jetpack composer packages

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    bdfa8f3 View commit details
    Browse the repository at this point in the history

  6. Reconnect Jetpack if already registered

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    341a11a View commit details
    Browse the repository at this point in the history

  7. Test Jetpack connect and reconnect

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    a6c57ff View commit details
    Browse the repository at this point in the history

  8. Rename Jetpack to WordPress.com connection

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    cd80eeb View commit details
    Browse the repository at this point in the history

  9. Replace WordPress.com disconnect with status

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    97ff040 View commit details
    Browse the repository at this point in the history

  10. Update connection status

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    c95a4cd View commit details
    Browse the repository at this point in the history

  11. Add WP reconnect button if connection failed

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    fb8fdc8 View commit details
    Browse the repository at this point in the history

  12. Fix typo

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    d920e91 View commit details
    Browse the repository at this point in the history

  13. Allow WP reconnect from ConnectionTest

    @mikkamp
    mikkamp committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    0e1c28d View commit details
    Browse the repository at this point in the history

  14. Consider ga_gtag_enabled=yes for WCGAI >= 2 

    Addresses #2287 (comment)
    @tomalec
    tomalec committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    d039b75 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #2288 from woocommerce/update/global-site-tag-for-… 

    …analytics-version-2-enabled

Consider `ga_gtag_enabled=yes` for  WCGAI >= 2
    @martynmjones
    martynmjones authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    8503d69 View commit details
    Browse the repository at this point in the history

  16. Remove esc_js from gtag config 

    Co-authored-by: Tomek Wytrębowicz <[email protected]>
    @martynmjones @tomalec
    martynmjones and tomalec authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    a8d5400 View commit details
    Browse the repository at this point in the history

  17. Ignore OutputNotEscaped warning for gtag config output

    @martynmjones
    martynmjones committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f9a5637 View commit details
    Browse the repository at this point in the history

  18. Add gtag consent mode v0 support

    @tomalec
    tomalec committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    7ff8bfc View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Merge pull request #2286 from woocommerce/dev/2175-fix-e2e-missing-te… 

    …st-data-plugin

Avoid the test-data plugin occasionally missing in the E2E test environment
    @eason9487
    eason9487 authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    b953a5a View commit details
    Browse the repository at this point in the history

  2. Mention how to update the consent mode in runtime 

    Addresses #2290 (comment)
    @tomalec
    tomalec committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    22410df View commit details
    Browse the repository at this point in the history

  3. Update WCGAI to GA4W branding 

    Address https://github.com/woocommerce/google-listings-and-ads/pull/2290/files#r1510986691
    @tomalec
    tomalec committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    de77d2b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2287 from woocommerce/update/global-site-tag-for-… 

    …analytics-version-2

Add support for Google Analytics for WooCommerce version 2.0.0
    @martynmjones
    martynmjones authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    439ff3c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2290 from woocommerce/add/gtag-consent

    @tomalec
    tomalec authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    119ed3b View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Rename connected state parameter

    @mikkamp
    mikkamp committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    11f1322 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2289 from woocommerce/fix/2285-jetpack-account-ha… 

    …ndling

Improve WordPress.com account handling
    @mikkamp
    mikkamp authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    d9bf454 View commit details
    Browse the repository at this point in the history

  3. Start release/2.6.1.

    @github-actions
    github-actions[bot] committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    b93ea2f View commit details
    Browse the repository at this point in the history

  4. Remove older changelog

    @jorgemd24
    jorgemd24 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    e3d0f1e View commit details
    Browse the repository at this point in the history

  5. woorelease: Product version bump update

    @jorgemd24
    jorgemd24 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    8f075d2 View commit details
    Browse the repository at this point in the history

  6. woorelease: Changelog update

    @jorgemd24
    jorgemd24 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    f07ed32 View commit details
    Browse the repository at this point in the history

  7. Update hooks documentation from branch.

    @github-actions
    github-actions[bot] committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    271f164 View commit details
    Browse the repository at this point in the history