Commit Graph

27078 Commits

Author SHA1 Message Date
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 85eae84d86
Merge pull request #18063 from woocommerce/fix/17454
Add BOM to export
2017-12-07 09:58:52 -08: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 45c973e7fe
Merge pull request #17955 from woocommerce/add/geo-and-activated-filtering
Adds geo and install plugin control to extensions featured page
2017-12-07 12:05:41 -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
Mike Jolley 9ef09b5a07 Add BOM to export
Closes #17454
2017-12-07 15:14:42 +00:00
Boro Sitnikovski c9d06bb4b9 Bump templates version 2017-12-07 16:00:30 +01: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 c971422f28
Merge pull request #18027 from woocommerce/fix/custom-webhook-topic
Removed webhook custom topic input and included better error messages
2017-12-07 14:26:51 +00:00
Mike Jolley cff172c0ea
Merge pull request #18054 from ragulka/exclusive-tax-rounding-test
Add test case for tax exclusive cart price rounding and totals
2017-12-07 14:24:54 +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 c950dcc6e3 Background processing; multisite should process current blog queue only
#17915
2017-12-07 13:01:05 +00:00
Claudio Sanches e6e61b084a
Merge pull request #18059 from woocommerce/fix/17914
PHPCS fixes and unslashing in exporter
2017-12-07 10:46:59 -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
Mike Jolley cadfcfc11f phpcs 2017-12-07 12:21:01 +00:00
Mike Jolley d3cd420c0a Format data of headers 2017-12-07 12:15:39 +00:00
Mike Jolley c3623a9967 Update docblock for $include_taxes
Closes #18053
2017-12-07 11:46:35 +00:00
Marcin Bot d0756a4a36 Fixed the undefined index notice 2017-12-07 11:20:04 +00:00
ragulka a2b7725777 Tweak test 2017-12-07 11:53:35 +02:00
ragulka ea7192e156 Add test case for tax exclusive cart price rounding 2017-12-07 11:49:31 +02:00
Jonathan Belcher b42004f7b3 Fix escaping 2017-12-06 16:48:30 -05:00
Claudio Sanches bb575ad07e Fixed @since 2017-12-06 19:12:42 -02:00
Claudio Sanches 390844f73b Fixed coding standards 2017-12-06 19:11:40 -02:00
Claudio Sanches cae02bee36 Fixed undefined variable on WC_Shipping_Zones::get_zone_by 2017-12-06 19:07:00 -02:00
Paul Dechov 1433347eda Remove unused description string for Braintree 2017-12-06 15:36:46 -05:00
Claudio Sanches 0946fd04cf Allow import and export draft products
Closes #17722
2017-12-06 18:32:35 -02:00
Paul Dechov f2cc10922a Add full stops to code comments 2017-12-06 14:53:31 -05:00