Merge pull request #2164 from Automattic/master

c-shultz · web-flow · commit 486b1a2bc1f7 · 2020-09-03T07:52:05.000-07:00
Merge back after 1.24.2 release.
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,6 @@
 *** WooCommerce Services Changelog ***
 
-= 1.24.2 - 2020-xx-xx =
+= 1.24.2 - 2020-09-03 =
 * Fix   - Optional preloading for wc-admin install compatibility
 * Fix   - Remove duplicate rate errors
 * Fix   - Compatibility with WooCommerce order page install prompt
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-services",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "scripts": {
     "start": "cross-env NODE_ENV=development CALYPSO_CLIENT=true webpack-dev-server --hot --inline --watch --content-base dist --port 8085",
     "prepare": "cd wp-calypso && npm ci && cd ..",
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: shipping, stamps, usps, woocommerce, taxes, payment, stripe
 Requires at least: 4.6
 Requires PHP: 5.3
 Tested up to: 5.5
-Stable tag: 1.24.1
+Stable tag: 1.24.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -83,6 +83,13 @@ As of the WooCommerce 3.5 release, WooCommerce Services no longer provides shipp
 
 == Changelog ==
 
+= 1.24.2 - 2020-09-03 =
+* Fix   - Optional preloading for wc-admin install compatibility
+* Fix   - Remove duplicate rate errors
+* Fix   - Compatibility with WooCommerce order page install prompt
+* Add   - Introduce 'wc_connect_meta_box_payload' filter for modifying order data
+* Tweak - Update UPS failed connection error message
+
 = 1.24.1 - 2020-08-19 =
 * Tweak - Zip/Postcode/Postal code messaging consistency
 * Fix   - Services management CSS table layout
diff --git a/woocommerce-services.php b/woocommerce-services.php
@@ -7,7 +7,7 @@
  * Author URI: https://woocommerce.com/
  * Text Domain: woocommerce-services
  * Domain Path: /i18n/languages/
- * Version: 1.24.1
+ * Version: 1.24.2
  * WC requires at least: 3.0.0
  * WC tested up to: 4.2
  *

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "woocommerce-services",`
`3`		`- "version": "1.24.1",`
	`3`	`+ "version": "1.24.2",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"start": "cross-env NODE_ENV=development CALYPSO_CLIENT=true webpack-dev-server --hot --inline --watch --content-base dist --port 8085",`
`6`	`6`	`"prepare": "cd wp-calypso && npm ci && cd ..",`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Author URI: https://woocommerce.com/`
`8`	`8`	`* Text Domain: woocommerce-services`
`9`	`9`	`* Domain Path: /i18n/languages/`
`10`		`- * Version: 1.24.1`
	`10`	`+ * Version: 1.24.2`
`11`	`11`	`* WC requires at least: 3.0.0`
`12`	`12`	`* WC tested up to: 4.2`
`13`	`13`	`*`