Commit Graph

40227 Commits

Author SHA1 Message Date
And Finally 124dc35e42 Correcting escaping of `$mapped->price`, using `wp_kses`. 2021-10-14 10:56:22 +01:00
And Finally 22b67783d0 Addressing feedback. Using cheaper escaping methods. 2021-10-14 10:43:51 +01:00
And Finally 85fa25ad92 Restored and annotated deprecated functions for backwards compatibility. 2021-10-14 10:27:06 +01:00
Timur Gogolev f54d7b0991 Apply PHPCS suggestions 2021-10-14 11:44:58 +03:00
Néstor Soriano 4850dc86fe
Merge pull request #30882 from woocommerce/update/wccom-11343
Reduce Storefront banner width & track links
2021-10-14 10:30:00 +02:00
Remi Corson 9aa7fd9dd7
Merge branch 'trunk' into update/wccom-11343 2021-10-14 08:38:05 +02:00
Remi Corson 5f1fb2fc23 Update content-hash in composer.lock 2021-10-14 08:34:55 +02:00
Jon Lane 1570c3cb36 Update changelog 2021-10-13 16:56:14 -07:00
Greg d6068977a1 Merge branch 'trunk' of https://github.com/woocommerce/woocommerce into fix/update-api-tests-package-lock 2021-10-13 14:19:31 -06:00
Ron Rennick 7f2751d075
Merge pull request #30660 from woocommerce/dependabot/npm_and_yarn/tests/e2e/api/axios-0.21.2
Bump axios from 0.19.2 to 0.21.2 in /tests/e2e/api
2021-10-13 16:48:59 -03:00
Greg 4684b1fdd2 Merge branch 'trunk' of https://github.com/woocommerce/woocommerce into fix/update-api-tests-package-lock 2021-10-13 13:48:34 -06:00
Greg bb0aadb41d Only update api core tests 2021-10-13 13:38:52 -06:00
Greg af841c83cd swap file 2021-10-13 13:37:44 -06:00
Ron Rennick d8e89ff1b3
Merge pull request #30755 from woocommerce/dependabot/npm_and_yarn/tests/e2e/api/tmpl-1.0.5
Bump tmpl from 1.0.4 to 1.0.5 in /tests/e2e/api
2021-10-13 16:22:09 -03:00
And Finally 3fbec9fc5c Restored more styles for `.addons-wcs-banner-block` used for WCPay and WCShip banners.
Restored `install_woocommerce_services_addon` and `install_woocommerce_payments_addon` methods, needed to install plugins from WCPay and WCShip banners.
2021-10-13 19:07:36 +01:00
And Finally c66d6f6095 Restored `output_search_promotion_block` and some of the CSS for `.addons-wcs-banner-block`. 2021-10-13 18:56:38 +01:00
And Finally 26affe1e8a Added condition to prevent showing `Sorry, could not find anything` message on featured page. This should only be shown when a search term has been submitted. 2021-10-13 18:39:57 +01:00
And Finally e12efaacde Reverting changes to CircleCi config in 618eca7c6a and cc0b78f8ec. These were attempts to unstick PHPUnit tests. 2021-10-13 18:27:17 +01:00
And Finally 10a4556eb1 Merge branch 'trunk' into update/marketplace-featured-page
# Conflicts:
#	includes/admin/class-wc-admin-addons.php
#	includes/admin/views/html-admin-page-addons.php
2021-10-13 18:23:11 +01:00
Greg e86ada0366 Use older Jest 2021-10-13 11:12:40 -06:00
Claudio Sanches a1989d117b
Merge pull request #30938 from woocommerce/add/wccom-11309
In-App Marketplace Category Banners
2021-10-13 13:59:45 -03:00
Greg d456472d42 Update top level package lock 2021-10-13 10:55:07 -06:00
And Finally 2fd16822c7 Updated content-hash to try and fix phpunit failure. https://github.com/woocommerce/woocommerce/pull/30840\#issuecomment-942422984. 2021-10-13 17:46:17 +01:00
And Finally d21faf4854
Update includes/admin/class-wc-admin-addons.php
Adding `$parameter_string` to end of URL for featured endpoint.
2021-10-13 17:37:59 +01:00
And Finally f6225ba8e1
Update includes/admin/class-wc-admin-addons.php
Returning country in request to featured 2.0 endpoint.
2021-10-13 17:37:37 +01:00
Timur Gogolev 618eca7c6a Try remove vendor folder from cache 2021-10-13 17:35:20 +01:00
Timur Gogolev cc0b78f8ec Test: clean up before running tests 2021-10-13 17:35:20 +01:00
Timur Gogolev a09becd8f8 Revert debug code 2021-10-13 17:35:20 +01:00
Timur Gogolev 9271855161 Use currency code from WCCOM instead of symbol 2021-10-13 17:35:20 +01:00
Timur Gogolev 5cef87be7d Use 3-column groups for screens more than 960px 2021-10-13 17:35:20 +01:00
Timur Gogolev 2f1835feec Adjust group's title+description+see more block 2021-10-13 17:35:19 +01:00
Timur Gogolev 61cb829726 Fix icon/image/paragraph of the product card 2021-10-13 17:35:19 +01:00
Timur Gogolev 7e428cfbbf Apply product group's capacity 2021-10-13 17:35:19 +01:00
Timur Gogolev 038ca86abb Fix product-related banner's image position 2021-10-13 17:35:19 +01:00
Timur Gogolev 2b0f3d1182 Fix showing rating/reviews number 2021-10-13 17:35:19 +01:00
Timur Gogolev 8024bddad7 Output products according to the group's capacity 2021-10-13 17:35:19 +01:00
Timur Gogolev a80058ca69 Render buttons based banner 2021-10-13 17:35:19 +01:00
Timur Gogolev f1cf628628 Handle product-like banners 2021-10-13 17:35:19 +01:00
Timur Gogolev f5e36fe81f Refactor product card to use with groups 2021-10-13 17:35:19 +01:00
Timur Gogolev f0790cbf51 Address review comments 2021-10-13 17:35:19 +01:00
Timur Gogolev b3756d398f Show ratings with the use of stars 2021-10-13 17:35:19 +01:00
Timur Gogolev 003b29aa0c Add developed-by string 2021-10-13 17:35:19 +01:00
Timur Gogolev 0b733d2d08 Use icon instead of image if possible 2021-10-13 17:35:19 +01:00
Timur Gogolev 916a13b6c6 Add stars and reviews number 2021-10-13 17:35:18 +01:00
Timur Gogolev 5c81b4f5ea Remove the current addons implementation 2021-10-13 17:35:18 +01:00
Gerhard d5c3d6da86
Typos 2021-10-13 17:59:41 +02:00
Claudio Sanches ad9c99b393 Fixed coding standards with PHPCBF 2021-10-13 12:50:19 -03:00
Claudio Sanches b385f3cb3f
Fix coding standards 2021-10-13 12:48:32 -03:00
Barry Hughes 45daf3c3c6
Merge pull request #30933 from woocommerce/preparation/post-5-8
5.8 changelogs
2021-10-13 08:30:20 -07:00
Timur Gogolev 3136dbb786 Revert composer.json 2021-10-13 18:26:01 +03:00