Commit Graph

38413 Commits

Author SHA1 Message Date
Adrian Duffell 5e988399dc Merge branch 'trunk' of github.com:woocommerce/woocommerce into dev/bump-woocommerce-admin-2-1-1 2021-03-18 06:34:42 +08:00
Roy Ho e62f20b9b3
Merge pull request #29049 from wppunk/master
Fix #29048
2021-03-17 13:46:19 -07:00
Ron Rennick e25ee7f36c fix merge conflicts 2021-03-17 16:40:49 -03:00
Greg fed4e14459
Merge pull request #29413 from woocommerce/fix/e2e-shipping-test
Attempt to fix flakiness in shipping test
2021-03-17 13:17:07 -06:00
Ron Rennick ddb940e993 Attempt to fix flakiness in shipping test
- Work around Delete and Edit action links not being visible
- delete all shipping zones at beginning of test
- use uiUnBlock instead of page wait
- ensure clicking method edit OK button
2021-03-17 14:48:06 -03:00
Roy Ho f89b21488e
Merge pull request #29391 from woocommerce/fix/28516
Handles errors in fault installations of PHP Intl
2021-03-17 09:43:06 -07:00
Claudio Sanches 3a629efc4b Check if order exists while check if COD is available 2021-03-17 13:20:46 -03:00
Claudio Sanches fc991ac418 Remove translation function 2021-03-17 12:50:52 -03:00
Greg b6f3c2b0be
Merge pull request #29383 from woocommerce/e2e/e2e-fix-flaky-checkout-coupons
Fixed flaky e2e test checkout coupons
2021-03-17 08:49:14 -06:00
Greg d74e998e92
Merge pull request #29173 from woocommerce/e2e/e2e-merchant-search-orders
Add new e2e test merchant order searching
2021-03-17 08:32:35 -06:00
Seghir Nadir 789c6bcca9
update woo-blocks to 4.7.0 2021-03-17 12:10:01 +01:00
Néstor Soriano 76ff6fbce3
Merge pull request #29403 from woocommerce/fix/version-documentation
Correct version in the docblock.
2021-03-17 10:48:42 +01:00
Peter Fabian b3108a03e9
Merge pull request #29393 from woocommerce/fix/fork-nightly-builds
Stop nightly builds in forks.
2021-03-17 10:34:46 +01:00
Peter Fabian aa9b6ab691 Change got merged sooner than expected. 2021-03-17 10:13:28 +01:00
Adrian Duffell 20c3a1c680 Bump woocommerce-admin package to 2.1.3 2021-03-17 16:43:12 +08:00
Néstor Soriano 7ba48234fa
Merge pull request #29397 from woocommerce/fix/issue-29163
Fix offsets not calculated correctly sometimes  on select2 dropdowns …
2021-03-17 09:38:04 +01:00
Adrian Duffell a55be9291f Merge branch 'trunk' of github.com:woocommerce/woocommerce into dev/bump-woocommerce-admin-2-1-1
# Conflicts:
#	composer.json
#	composer.lock
2021-03-17 16:32:32 +08:00
Veljko V f65c493e38
Merge branch 'trunk' into e2e/e2e-merchant-search-orders 2021-03-17 09:07:51 +01:00
Néstor Soriano 17224d0ab1
Merge pull request #29345 from woocommerce/hw/low-stock-threshold-for-variations
Low stock threshold for variations
2021-03-17 08:59:32 +01:00
Greg c3e765642c
Merge pull request #29104 from woocommerce/e2e/e2e-merchant-settings-shipping-zones
Add new e2e test merchant shipping zones test
2021-03-16 19:07:24 -06:00
Ron Rennick a3aacf5661 update utils readme 2021-03-16 16:57:42 -03:00
Ron Rennick ed4f3af997 update/expand core tests and api readmes 2021-03-16 16:00:01 -03:00
Ron Rennick 34ef87acd3 Merge branch 'trunk' into fix/29277 2021-03-16 13:33:30 -03:00
Claudio Sanches 5c6778a0dc Fix coding standards 2021-03-16 11:46:34 -03:00
Claudio Sanches b0dce9feff Fixed coding standards 2021-03-16 11:42:28 -03:00
roykho a1cda953dc
Fix offsets not calculated correctly sometimes on select2 dropdowns closes #29163 2021-03-16 07:39:09 -07:00
Ron Rennick 48dc56d32a update e2e main and env readmes 2021-03-16 11:06:44 -03:00
Ron Rennick 53451e5b36 update init-wp-beta.sh with changes to initialize.sh 2021-03-16 10:54:47 -03:00
Tam Mullen a7bceeb50f
Merge pull request #28818 from woocommerce/e2e-shopper-pay-order
Add new e2e test shopper my account pay order
2021-03-16 13:26:21 +00:00
Renovate Bot d1926e52b2
Update dependency league/container to v3.3.5 2021-03-16 12:12:49 +00:00
Peter Fabian 351c07d655 Improved tests, added save points, fixed comments. 2021-03-16 13:08:29 +01:00
Peter Fabian cb6e0d8201 Don't echo the strings, return them for later use. 2021-03-16 13:01:15 +01:00
Peter Fabian a2e9c055d5 Make the inherited values explicit by stating where it comes from. 2021-03-16 12:39:25 +01:00
Ewout Fernhout c51f748855 check return type on log file fopen 2021-03-16 12:05:06 +01:00
Veljko 58d85a8321 Merge branch 'trunk' into e2e/e2e-fix-flaky-checkout-coupons 2021-03-16 09:44:55 +01:00
Veljko 449f3809b4 Merge branch 'trunk' into e2e/e2e-merchant-search-orders 2021-03-16 09:07:37 +01:00
Veljko 1e59f49f08 Merging with trunk and improving test 2021-03-16 09:02:52 +01:00
Veljko 33978a5e5b Merge branch 'trunk' into e2e/e2e-merchant-settings-shipping-zones 2021-03-16 08:54:18 +01:00
Peter Fabian f33c80186f Updated the wording of the tooltip. 2021-03-16 08:51:29 +01:00
Claudio Sanches 599f2e95ca Stop nightly builds in forks.
Nightly builds workflow requires a GitHub release ID that doesn't exists
in forks, making it to always fail.
2021-03-15 21:44:01 -03:00
Greg d7eb6d0b9e
Merge pull request #28851 from woocommerce/e2e/api/poc-delete-products
Use api to delete products before e2e tests
2021-03-15 16:22:12 -06:00
Claudio Sanches 3f50ab3278 Handles errors in fault installations of PHP Intl 2021-03-15 17:48:49 -03:00
Mahmoud Saeed 0e13eb1320 Fix taxes endpoint not returning multiple postcodes/cities 2021-03-15 22:16:36 +02:00
Peter Fabian bb5c56c148 Set correct placeholder value for variation--first the parent, then the store-wide default. 2021-03-15 18:41:55 +01:00
Peter Fabian e6cdd74a79 Add parent's default for low stock if notthing is set on individual variation.
I.e. use variation low stock amount value, if not available, use parent product's value, if not available, use the store-wide default.
2021-03-15 18:31:31 +01:00
Ron Rennick f1cb81d5db
Merge pull request #29346 from woocommerce/fix/e2e-wp57-cli
Fix e2e tests on WordPress 5.7
2021-03-15 14:24:26 -03:00
Ron Rennick 6031cd922e Merge branch 'trunk' into e2e/api/poc-delete-products 2021-03-15 14:14:31 -03:00
Ron Rennick 372b721b1c package lock maintenance, remove simple products in group product test 2021-03-15 14:04:37 -03:00
Ron Rennick b64c99a8fb Merge branch 'trunk' into update/e2e-api-product-delete 2021-03-15 13:47:56 -03:00
Roy Ho 57569c5168
Merge pull request #29232 from Dartui/trunk
Pass checkout submit result to triggered handler
2021-03-15 09:46:31 -07:00