Commit Graph

13846 Commits

Author SHA1 Message Date
Caleb Burks c7a583e5c1 Add CSV import option to use previous mapping 2017-12-09 02:58:07 -06:00
Caleb Burks 9db92e7152 Remove html that was being escaped 2017-12-09 01:13:27 -06:00
Mike Jolley 426897ac2d
Merge pull request #18075 from woocommerce/update/extension-screen-styles
Update extension screen styles
2017-12-08 17:28:39 +00:00
Claudio Sanches eaa440df5f
Merge pull request #18071 from woocommerce/update/18045
Attributes; remove 'text' display option
2017-12-08 14:36:36 -02:00
Mike Jolley 1f109ba62e Merge branch 'pr/18072' 2017-12-08 16:32:58 +00:00
Mike Jolley b4bfe6303f Keep public method around 2017-12-08 16:24:04 +00:00
Claudiu Lodromanean 99e948551f
Merge pull request #18076 from woocommerce/fix/18069
Shipping calculator and taxes
2017-12-08 08:17:45 -08:00
Mike Jolley 5b0df590c0
Merge pull request #18065 from woocommerce/improve/18064
Add default row/column control for themes
2017-12-08 16:14:19 +00:00
claudiulodro fef9d612c7 Better function name 2017-12-08 07:38:40 -08:00
claudiulodro b2cac1dcab Better description 2017-12-08 07:36:33 -08:00
claudiulodro e37391affb Set/remove defaults on theme activation 2017-12-08 07:33:42 -08:00
claudiulodro 600b1bd82c Revert "Add defaults control for themes"
This reverts commit 29090e4676.
2017-12-08 07:23:46 -08:00
Mike Jolley 912c3e2ef8 Process form fields if set 2017-12-08 14:11:41 +00:00
Mike Jolley d0db71c6c2 Flex grid for extension list 2017-12-08 13:23:08 +00:00
Mike Jolley 1bf47c2a81 API: Use KSES for purchase_note like admin 2017-12-08 11:47:27 +00:00
Mike Jolley 1944bf7191 Remove text type setting 2017-12-08 11:24:21 +00:00
James Allan 82c282e83a Clone the child objects rather than instantiating new objects.
When cloning the cart, the current fees and session objects should
remain the same but have new pointers.
2017-12-08 21:15:45 +10:00
James Allan 83de162adb Only remove fees which belong to the cart which is being emptied/reset
If there are multiple instances of WC_Cart and therefore multiple
instances of WC_Cart_Fees, if 1 cart is emptied and
woocommerce_cart_emptied is triggered, all instances of WC_Cart_Fees
will trigger remove_all_fees, removing all the fees from all the carts.
2017-12-08 21:15:08 +10:00
Gerhard Potgieter 0c5a0b06cc
Merge pull request #17926 from woocommerce/add/search-functionality-extensions-page
Adds search functionality to extensions page
2017-12-08 10:48:38 +02:00
Gerhard Potgieter 75ecb887c3
Merge pull request #18017 from woocommerce/tweak/decouple-cart-template-methods
Decouple cart templating methods from WC_Cart class
2017-12-08 08:15:46 +02:00
claudiulodro e22318449e Fix syntax error @bor0 2017-12-07 14:29:07 -08:00
Claudio Sanches 05987ff3be Removed unresolved merge conflicts 2017-12-07 19:06:07 -02:00
Claudio Sanches 2f6f6112c2 Merge branch 'master' into feature/webhook-crud 2017-12-07 18:21:52 -02:00
Claudio Sanches 2db8fdbf0b Removed legacy custom topic handler 2017-12-07 18:04:45 -02:00
claudiulodro 29090e4676 Add defaults control for themes 2017-12-07 11:35:06 -08:00
Boro Sitnikovski b6801d3761 Fix wrong call 2017-12-07 20:16:54 +01:00
Boro Sitnikovski d0f9aaa99a Merge branch 'master' into tweak/decouple-cart-template-methods 2017-12-07 20:16:08 +01:00
Claudiu Lodromanean 1b079f1e43
Merge pull request #18061 from woocommerce/fix/import-export-18047
Fix ID mapping to existing IDs
2017-12-07 09:57:31 -08:00
Jonathan Belcher f4d6b6f68f Merge Commit 2017-12-07 12:10:00 -05:00
Jonathan Belcher 3bb55107e8 Fix placeholder comment 2017-12-07 12:04:25 -05:00
Jonathan Belcher 885f869d40 Merge commit 2017-12-07 12:02:55 -05:00
Jonathan Belcher 937cdbf230 Merge commit 2017-12-07 11:50:42 -05:00
Jonathan Belcher 9695bc4183 Small code review changes 2017-12-07 11:47:33 -05:00
Claudiu Lodromanean 7c06e7d63d
Merge pull request #18008 from woocommerce/update/rounding-17970-17863
Rounding fixes/line item rounding
2017-12-07 08:34:15 -08:00
Claudiu Lodromanean 804c771296
Merge pull request #17683 from woocommerce/feature/unsupported-theme
Unsupported theme enhancements
2017-12-07 08:05:29 -08:00
Mike Jolley 5e51af9d2c Fix white space in order actions 2017-12-07 15:50:27 +00:00
Mike Jolley 36b1753925 Version 2017-12-07 15:41:53 +00:00
Mike Jolley 7a94bf06df Reversion changes 2017-12-07 15:39:10 +00:00
Mike Jolley d7b29bc833 Merge branch 'pr/17993' 2017-12-07 15:33:36 +00:00
Mike Jolley f0c04b019b Rename filter and pass order 2017-12-07 15:33:26 +00:00
Mike Jolley 7e7b79efd0 typo 2017-12-07 15:31:55 +00:00
Mike Jolley 05d6e393ae Merge branch 'pr/18013' 2017-12-07 15:29:59 +00:00
Mike Jolley 54d4012c33 Use timestamp function 2017-12-07 15:24:57 +00:00
Boro Sitnikovski 588c5f3779 Change method name 2017-12-07 15:53:16 +01:00
Mike Jolley 86ff5f5842
Merge pull request #18049 from woocommerce/fix/undefined-var
Fixed undefined variable on WC_Shipping_Zones::get_zone_by
2017-12-07 14:32:21 +00:00
Mike Jolley 03db5c4590
Merge pull request #18048 from woocommerce/fix/17722-2
Allow import and export draft products
2017-12-07 14:29:50 +00:00
Mike Jolley 3de87d3db7 Fix ID mapping to existing IDs
Fixes #18047
2017-12-07 14:12:20 +00:00
Claudio Sanches 3300534963
Merge pull request #18058 from woocommerce/fix/18053
Update docblock for $include_taxes
2017-12-07 11:05:39 -02:00
Mike Jolley acbd4295f9 phpcs 2017-12-07 12:35:13 +00:00
Mike Jolley 91887b918f phpcs 2017-12-07 12:31:30 +00:00