Commit Graph

22639 Commits

Author SHA1 Message Date
Gerhard Potgieter 6d3e3fd5e5 Merge branch 'feature/helper' of github.com:woocommerce/woocommerce into feature/helper 2017-06-21 16:58:26 +02:00
Gerhard Potgieter e08df8d2aa Adjust messaging and display information for collaborator accounts on woocommerce.com subscription page. 2017-06-21 16:57:16 +02:00
Konstantin Kovshenin 346b446283 Helper: Fix label for maxed out subscriptions. 2017-06-21 17:50:34 +03:00
Frédéric Demarle d563842126 CSV Importer: Add action before a row is parsed 2017-06-21 16:49:21 +02:00
Konstantin Kovshenin 41ea3f3f43 Helper: Pass a migrate flag if migrating during token exchange 2017-06-21 16:23:57 +03:00
Konstantin Kovshenin 16f2541e9b Helper: Set helper compat screen slug to woothemes-helper.
Previously the helper compat screen used a different slug, but
since updates can be done without refreshing the screen via AJAX
the old menu item doesn't disappear until a full refresh. This fix
allows users to navigate to that same menu item and not get an
error.
2017-06-21 15:28:30 +03:00
Mike Jolley 24780e7ace Fix example wrapping 2017-06-21 13:06:25 +01:00
Mike Jolley dbe9705e4b Disable search engines indexing core, dynamic, cart/checkout pages. 2017-06-21 12:52:52 +01:00
Mike Jolley 5ffff712e7 Merge pull request #15705 from woocommerce/update/cache-helper
Compare page IDs rather than URIs in the cache helper
2017-06-21 12:11:16 +01:00
Mike Jolley 31fccea25c Exclude sale products from category checks in coupon class
Fixes #15715
2017-06-21 11:55:12 +01:00
Mike Jolley e3a9cc9a3d Update ISSUE_TEMPLATE.md 2017-06-21 10:06:28 +01:00
Mike Jolley 5271125bc1 Merge pull request #15710 from woocommerce/fix-external-products-unneeded-setting
Hide Cross-sells for external products
2017-06-21 09:48:47 +01:00
Caleb Burks cfbd56c04a Remove some settings for grouped products
Purchase notes and Cross-sells aren’t needing as you can never add a grouped product to your cart or purchase it.
2017-06-20 21:04:56 -05:00
Caleb Burks f13c4c3b30 Hide Cross-sells for external products 2017-06-20 20:56:54 -05:00
Claudiu Lodromanean aab401c8f8 Merge pull request #15703 from woocommerce/fix/15689
Filter out non-visible products when outputting grouped products + prices
2017-06-20 14:50:50 -07:00
Claudiu Lodromanean 9399a8dca2 Merge pull request #15702 from woocommerce/fix/15697
Correctly map attribute labels to names
2017-06-20 14:46:45 -07:00
Mike Jolley b6929a8abb Template version bumps 2017-06-20 15:49:02 +01:00
Mike Jolley 91511bd92a Merge pull request #15631 from woocommerce/update/13738
Create a way to 'resend order details'
2017-06-20 15:09:10 +01:00
Mike Jolley e4be09f6e2 Filter visible children when outputting grouped product prices 2017-06-20 15:01:23 +01:00
Mike Jolley 98684233dc Filter visible children when outputting grouped products 2017-06-20 15:01:14 +01:00
Mike Jolley ae0e03ef53 wc_products_array_filter_visible_grouped method 2017-06-20 15:00:58 +01:00
Mike Jolley 5f0780efe8 Update ISSUE_TEMPLATE.md 2017-06-20 14:25:10 +01:00
Mike Jolley 037748093a Merge pull request #15700 from Chouby/before_row_import_action
[3.1] Add an action before importing a new product
2017-06-20 14:17:17 +01:00
Mike Jolley 6a6aca4132 Correctly map attribute labels to names
Fixes #15697
2017-06-20 14:15:35 +01:00
Frédéric Demarle 4960af34aa Add an action before importing a row 2017-06-20 14:25:23 +02:00
Mike Jolley 6cea4e87cc Compare page IDs rather than URIs in the cache helper 2017-06-20 12:09:46 +01:00
Mike Jolley 22c79b2ba2 Merge pull request #15682 from 1do/master
Changed misspelled filter name
2017-06-20 08:49:05 +01:00
Caleb Burks ae6a5e34f2 Move “Grouped products” setting to the top 2017-06-19 21:59:42 -05:00
Allen Snook 25c9219849 Add unit tests for new address city and postcode fields 2017-06-19 13:12:39 -07:00
Claudio Sanches d1d555461c Fixed a typo 2017-06-19 16:22:40 -03:00
Allen Snook 0f311f0cba Add address, address 2, city and postcode to setup wizard 2017-06-19 12:22:05 -07:00
Allen Snook 61a8d858b5 Update address labels in settings to better match customer address labelling 2017-06-19 11:28:42 -07:00
1do ff98b72463 Replaced deprecated wocommerce_credit_card_type_labels in favor of woocommerce_credit_card_type_labels filter. 2017-06-19 21:24:53 +03:00
Claudiu Lodromanean f879317f44 Merge pull request #15678 from woocommerce/fix/15676
Normalise emails on set
2017-06-19 10:26:31 -07:00
Claudiu Lodromanean 139ed8e994 Merge pull request #15680 from woocommerce/fix/15669
Update description for exclude_sale_items
2017-06-19 10:22:42 -07:00
Claudiu Lodromanean 4151afe27c Merge pull request #15683 from woocommerce/update/grunt-packages
Update/grunt packages
2017-06-19 10:15:04 -07:00
claudiulodro d0266938bf Recompile css 2017-06-19 10:13:27 -07:00
Claudiu Lodromanean 489ea9ebf4 Merge pull request #15684 from woocommerce/fix/15673
Give the icon a background color
2017-06-19 09:59:35 -07:00
Claudiu Lodromanean c38d02b62b Merge pull request #15686 from woocommerce/fix/15663
Add tax class and status to export
2017-06-19 09:50:18 -07:00
Mike Jolley 712c281fb7 Add tax class and status to export
Fixes #15663
2017-06-19 14:01:52 +01:00
Mike Jolley 85134b91eb Give the icon a background color
Fixes #15673
2017-06-19 13:06:54 +01:00
Mike Jolley a1940f2da3 Grunt dev 2017-06-19 12:49:34 +01:00
Mike Jolley 9d0636410d Update gruntfile options 2017-06-19 12:49:27 +01:00
Mike Jolley 9ff7d3aea8 Update JSON 2017-06-19 12:38:32 +01:00
1do 344807bd15 changed misspelled filter name 2017-06-19 14:22:31 +03:00
Mike Jolley acf0026834 Update description for exclude_sale_items 2017-06-19 11:56:04 +01:00
Mike Jolley b47e1ee728 Use the product object rather than function wc_get_product_ids_on_sale 2017-06-19 11:53:26 +01:00
Mike Jolley d9e34d4e86 Normalise emails on set 2017-06-19 10:48:00 +01:00
Mike Jolley 55ca1899ad Merge pull request #15660 from woocommerce/fix/cli-ids
Fix issues with CLI IDs
2017-06-19 10:24:46 +01:00
Mike Jolley 1f7b0265c1 Merge pull request #15628 from woocommerce/update/15623
woocommerce_format_localized_decimal + woocommerce_format_localized_price filters
2017-06-19 10:13:02 +01:00