Commit Graph

24 Commits

Author SHA1 Message Date
And Finally 0bc7e4bc65
Combine My Subscriptions and Marketplace back into one Extensions page (#31085)
* Reverting changes in https://github.com/woocommerce/woocommerce/pull/30380, preparatory to merging the My Subscriptions and Marketplace pages back into one Extensions page.

* Moved category nav to a separate file.

* Added main nav tabs.

* Added category nav, styled the mobile version.

* Experiments with doing category tabs as a list.

* Styling category menu as a list of links in rectangular pills on desktop.

* Adjusting margins of product list in in-app marketplace.

* Removed `submenu_file` filter which called deleted `update_menu_highlight` method.

* Restored styling for update count bubble on My Subscriptions tab.

* Styling update bubble on My Subscriptions tab.

* Addressing design feedback. Restyled category pills to make them more obvious. Added `Browse categories` title before category menu on desktop. Changed `.addon-product-group-title` to an h2.

* Addressing feedback from https://github.com/woocommerce/woocommerce/pull/31085#pullrequestreview-806319880.

- Removing addition of `admin_title` filter calling deleted `update_my_subscriptions_title` method.
- Prepending `__DIR__` constant before path in `require` call.
2021-11-16 06:23:21 -07:00
Christopher Allford c91dda177d
Fix E2E Tests (#31205)
* Removed Changlogger Autoload

* Changed Jetpack Changelogger Formatter Loading

Rather than using the Composer autoload, we should use the
changelogger's "filename" option to point directly at the file.
This keeps the file out of the autoloads, since it's possible that
plugins or packages may be symlinked and break the relative
path to the plugin.
2021-11-16 15:01:50 +13:00
Ron Rennick e13869c442 fix merge conflicts 2021-11-15 13:03:14 -04:00
Paul Sealock 15f26ee8f7 update to 3.0.2 of changelogger 2021-11-11 17:03:44 +13:00
Paul Sealock 5d6539d209 lock files 2021-11-11 16:55:05 +13:00
Paul Sealock 5c68568bb7 Revert "add nx composer-install targets"
This reverts commit ffaef64343.
2021-11-11 16:47:50 +13:00
Paul Sealock ffaef64343 add nx composer-install targets 2021-11-11 16:43:27 +13:00
Paul Sealock 20fb81eb5a point to next changelog 2021-11-11 16:38:38 +13:00
Paul Sealock e08cc18e16 js packages next changelogs 2021-11-11 16:34:50 +13:00
Paul Sealock a5abab9ab0 Add Jetpack Changelogger 2021-11-11 16:28:10 +13:00
Ron Rennick 7fc5e1e088 fix merge conflicts 2021-11-10 15:51:00 -04:00
Ron Rennick 7850b930ce fix merge conflicts 2021-11-10 15:48:20 -04:00
Greg 008e4f19c4
Merge pull request #31114 from woocommerce/fix/30867
move coupon delete, add tax classes, rates to withRestApi
2021-11-10 10:49:26 -07:00
Ron Rennick 6d4e90ef59 make expect calls in withRestApi optional 2021-11-10 12:25:09 -04:00
Roy Ho 9d08ac8ac3
Merge pull request #31095 from woocommerce/setup-nx
Setup nx
2021-11-09 20:26:37 -08:00
Ron Rennick 93b9745b80 arithematic to logical OR 2021-11-09 16:41:44 -04:00
Ron Rennick eeb331f160 move coupon delete, add tax classes, rates to withRestApi 2021-11-09 14:09:26 -04:00
Ron Rennick 9582aa5107 move clickAndWaitForSelector to utils package 2021-11-08 13:38:55 -04:00
Ron Rennick a6df312732
Merge pull request #31084 from woocommerce/fix/e2e-env-readme-links
Update links to moved e2e READMEs.
2021-11-05 15:54:30 -03:00
roykho b64d0b3dfe
Add initial project.json config files to all packages and plugins 2021-11-04 14:51:04 -07:00
Tomek Wytrębowicz e73329fdf3 Update links to moved e2e READMEs. 2021-11-04 12:58:11 +01:00
Greg e45c270a51 Add file missing from merge 2021-10-29 15:33:37 -06:00
Greg a28840b1d9 Merge branch 'trunk' of github.com:woocommerce/woocommerce into add/run-api-tests-on-pr
# Conflicts:
#	.github/workflows/pr-build-and-e2e-tests.yml
#	plugins/woocommerce/tests/e2e/core-tests/specs/merchant/wp-admin-product-import-csv.test.js
2021-10-29 15:31:48 -06:00
Paul Sealock 789d942f89
Update e2e package locations and add PNPM (#30977) 2021-10-29 08:32:31 +13:00