Commit Graph

21124 Commits

Author SHA1 Message Date
Mike Jolley 8a22d41605 Merge remote-tracking branch 'origin/master' 2017-05-23 19:29:44 +01:00
Mike Jolley 41e8b22b5a Merge branch 'pr/15219' 2017-05-23 19:28:45 +01:00
Mike Jolley 002dd935b5 Check we have a product object 2017-05-23 19:28:35 +01:00
Mike Jolley 35536b8ace Merge pull request #14576 from Chouby/tools_message
Add custom message for custom system status tools
2017-05-23 19:22:47 +01:00
Mike Jolley 6dfdc86111 Merge branch 'pr/14678' 2017-05-23 19:16:37 +01:00
Mike Jolley 109e951de3 Renamed filters and actions 2017-05-23 19:16:30 +01:00
Mike Jolley c16acc6b51 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
2017-05-23 19:00:24 +01:00
Mike Jolley d3666738d8 Merge branch 'pr/15069' 2017-05-23 18:56:58 +01:00
Mike Jolley 00e5189a05 Merge pull request #15070 from rasmusbe/phpdoc-missing-return-throws
Phpdoc: Add missing return and throws
2017-05-23 18:50:58 +01:00
Mike Jolley 4efc8d1247 Merge remote-tracking branch 'origin/master' 2017-05-23 18:48:31 +01:00
Mike Jolley 3b1894dd8f Merge branch 'pr/15039' 2017-05-23 18:48:24 +01:00
Mike Jolley c709b7f490 since 2017-05-23 18:48:16 +01:00
Mike Jolley c6d63e7819 Merge pull request #15017 from Ninos/filter/cookie
Filter for cookie name
2017-05-23 18:38:42 +01:00
Mike Jolley f594f11273 Merge pull request #14293 from woocommerce/fix/14162-query
Set and restore wp_query so product page functions think it's a real product page
2017-05-23 18:29:24 +01:00
Mike Jolley c4837f4419 Merge pull request #14653 from woocommerce/fix/14150
Update price sorting code
2017-05-23 18:13:27 +01:00
Diego Zanella a6bcc73846 Added $customer to filter woocommerce_customer_get_total_spent_query 2017-05-23 17:06:16 +01:00
Diego Zanella 885cb14029 Merge branch 'master' into Improvement-customer-total-spent-filter 2017-05-23 17:05:08 +01:00
Mike Jolley 8f27df6af3 Merge pull request #14294 from woocommerce/fix/14292
When searching, disable WC sort order
2017-05-23 16:43:24 +01:00
Mike Jolley eec5c73f2e Merge pull request #15125 from woocommerce/feature/13088
Adds storefront/theme step to the setup wizard
2017-05-23 16:37:07 +01:00
Mike Jolley 15f47e00a2 Merge branch 'master' into feature/13088
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/twenty-seventeen-rtl.css
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-05-23 16:35:17 +01:00
Mike Jolley f833aadf39 Merge pull request #14975 from tractus/master
Added namespace to jQuery events that are removed in VariationForm
2017-05-23 16:27:49 +01:00
Mike Jolley ec03133ebc Merge remote-tracking branch 'origin/master' 2017-05-23 16:23:11 +01:00
Mike Jolley f1622c204f Merge branch 'pr/14896' 2017-05-23 16:22:48 +01:00
Mike Jolley a1a79e57b5 Merge branch 'master' into pr/14896
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-05-23 16:22:18 +01:00
Mike Jolley db012b3a12 Merge pull request #15011 from woocommerce/fix/14999
Add abspath checks
2017-05-23 15:57:35 +01:00
Mike Jolley d31a58b117 More abspath 2017-05-23 15:40:19 +01:00
Mike Jolley 2d479e0580 Update serializejson to 2.8.1
Closes #14630
2017-05-23 15:27:53 +01:00
Mike Jolley 103f674d18 Merge pull request #14689 from woocommerce/fix/14578
Add a data-caption for captions and keep title around.
2017-05-23 15:09:56 +01:00
Mike Jolley b140f61510 Merge branch 'master' into fix/14578
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-05-23 15:09:20 +01:00
Mike Jolley 7901653f94 Merge pull request #15003 from woocommerce/fix/15001
Use VAT for norway
2017-05-23 15:07:39 +01:00
Mike Jolley 90213efa46 Merge pull request #15227 from woocommerce/fix/15225
A single multi-word attribute is fine for variation titles
2017-05-23 15:06:55 +01:00
claudiulodro 52fc3ad4c6 Good progress on order unit tests 2017-05-23 06:55:28 -07:00
Mike Jolley 2383799409 A single multi-word attribute is fine for variation titles
Closes #15225
2017-05-23 10:52:44 +01:00
Mike Jolley f09f7eb84e Merge pull request #15150 from woocommerce/fix/15118
Add handles so drag and drop does not break edit on mobile
2017-05-23 10:20:08 +01:00
Mike Jolley 66f2ea25e9 Merge pull request #15223 from dixitadusara/issue-15213
Issue Missing $ip Variable #15213
2017-05-23 09:02:05 +01:00
dixitadusara ebe831ccec Issue Missing $ip Variable #15213 2017-05-23 11:50:30 +05:30
James Kemp 90c987af70 Utilise $product method to get thumbnail
Is there any reason this function isn't using the `get_image()` method? It seems if we're accessing the `$post->ID`, then we should have access to the `$product` object too?

The reason being, the `get_image()` method also checks for the parent featured image, so is more robust. It may also be worth considering a filter in the `get_image()` method.
2017-05-22 22:07:51 +01:00
Claudiu Lodromanean 4bbc50d52c Merge pull request #15182 from woocommerce/fix/14861
Group by term ID to prevent duplicates
2017-05-22 13:14:47 -07:00
Claudiu Lodromanean 58189cb4b5 Merge pull request #15208 from woocommerce/fix/15203
Missing variable in legacy API
2017-05-22 13:10:28 -07:00
Claudiu Lodromanean d530587cd3 Merge pull request #15170 from woocommerce/fix/15163
Cancelled email should be send for processing orders, not pending.
2017-05-22 12:00:25 -07:00
Claudiu Lodromanean 2a19598930 Merge pull request #15214 from woocommerce/fix/15191
Update jquery payment to v3
2017-05-22 11:13:22 -07:00
Claudiu Lodromanean 700460d925 Merge pull request #15211 from woocommerce/fix/15002
Zones API changes for zone 0
2017-05-22 11:12:59 -07:00
Mike Jolley 2a51aa2020 Update jquery payment to v3 2017-05-22 16:37:08 +01:00
Mike Jolley c0e7c2f517 Merge pull request #15173 from woocommerce/fix/15158
Always sync incorrect titles on variation read regardless of version
2017-05-22 16:20:55 +01:00
Mike Jolley b1bf3278a7 Prevent zone 0 having locations set in CRUD 2017-05-22 15:19:15 +01:00
Mike Jolley 8cba7db7cd Prevent zone 0 name being changed 2017-05-22 15:19:04 +01:00
Mike Jolley a826b363d8 Prevent zone 0 locations being changed 2017-05-22 15:18:55 +01:00
Mike Jolley d1b49888f2 Missing variable in legacy API
Fixes #15203
2017-05-22 13:25:33 +01:00
Mike Jolley fc8100877c Undo change 2017-05-22 12:19:54 +01:00
Mike Jolley a15fffb945 Merge pull request #15204 from ughimire/nepali-zones
Tweak - Nepali zone name update
2017-05-22 12:18:35 +01:00