Commit Graph

22465 Commits

Author SHA1 Message Date
Josh Smith 6dadaa0f7f Merge remote-tracking branch 'upstream/master' 2017-08-11 16:29:16 +00:00
Mike Jolley 73a1fc21f1 Merge pull request #16407 from woocommerce/fix/16396
Remove figure margin/padding css
2017-08-11 10:50:40 +01:00
Mike Jolley fc0d729034 Remove figure margin/padding css
Closes #16396
2017-08-11 10:49:52 +01:00
Mike Jolley e124841cbf Merge pull request #16401 from woocommerce/fix/16378
Use new CRUD actions to trigger Webhooks
2017-08-11 10:35:23 +01:00
Josh Smith 9e06209277 Merge remote-tracking branch 'upstream/master' 2017-08-11 05:00:52 +00:00
Josh Smith ae8a797961 [#12517] Use ISO 8601 time format to convert timestamps to WC_DateTime for PHP 5.2 compat 2017-08-11 04:50:44 +00:00
Josh Smith 115d19ca30 [#12517] Adding Unit Tests for WC_Customer_Download_Log and new download log tracking 2017-08-11 04:35:18 +00:00
Claudio Sanches 3f12fd1b01 Fixed missing hooks in legacy REST API 2017-08-10 18:57:31 -03:00
Claudio Sanches 40cb0e2e95 Trigger only customer.created webhook 2017-08-10 18:57:13 -03:00
Claudiu Lodromanean a5ffbe6e7f Merge pull request #16403 from woocommerce/fix/16195
[Importer] Allow "unfiltered_html" for name, description and short description fields
2017-08-10 13:55:46 -07:00
Claudiu Lodromanean 77bed2396c Merge pull request #16400 from woocommerce/fix/16394
Apply logical sort order to discounts
2017-08-10 13:43:32 -07:00
Claudio Sanches a01ffdd11d Better variable naming for importer parser methods 2017-08-10 17:23:31 -03:00
Claudio Sanches fe05e09015 Skip title, description and exceprt sanitization and let WP handle it
Should simulate the same behavior from WP admin, so just need to skip
extra sanitization, so WP can handle it while salving with
`wp_insert_post()` and `wp_update_post()` where will check for
`unfiltered_html` capability.

WP core already did something like it, but on REST API: https://core.trac.wordpress.org/ticket/38609

Fixes #16195
2017-08-10 17:17:56 -03:00
Claudio Sanches 069cf21c08 Use new CRUD actions to trigger Webhooks
Closes #16378
2017-08-10 13:56:17 -03:00
Claudiu Lodromanean 1745447c7c Merge pull request #16391 from woocommerce/fix/php52-rounding-mode
Fake round half down in PHP 5,2
2017-08-10 09:39:38 -07:00
Mike Jolley 51dffc0853 Apply logical sort order to discounts
Closes #16394
2017-08-10 17:24:27 +01:00
Claudio Sanches a7b402b035 Removed extra end of lines 2017-08-10 13:08:30 -03:00
Mike Jolley aa82a54f47 Prevent notices 2017-08-09 19:27:19 +01:00
Mike Jolley 2ba0c64387 readme 2017-08-09 17:13:00 +01:00
Mike Jolley 73350e5418 Fake round half down in PHP 5,2
Fixes unit tests.
2017-08-09 11:59:50 +01:00
Mike Jolley 30a85e9f8d Merge branch 'pr/16036' 2017-08-09 10:11:20 +01:00
Mike Jolley c1544e443a Version and escape 2017-08-09 10:11:07 +01:00
Mike Jolley 8af2ce8a20 Merge pull request #16379 from EmilEriksen/master
Store status_transition in a local variable and reset it before firing hooks in order to avoid infinite loops
2017-08-09 10:01:24 +01:00
Josh Smith d8b6b2042a Merge remote-tracking branch 'upstream/master' 2017-08-08 21:20:35 +00:00
Mike Jolley 6e59b540e1 Merge pull request #16382 from woocommerce/improve/16165
Allow define customer ID in wc_get_account_formatted_address()
2017-08-08 16:17:26 +01:00
Claudio Sanches d8af7cdeec Merge pull request #16380 from woocommerce/fix/16316
Fix filename image handling
2017-08-08 12:11:17 -03:00
Claudio Sanches 56f654eb4c Allow define customer ID in wc_get_account_formatted_address()
This should help 3rd party integrations, like custom emails or invoices.

Releated to #16165
2017-08-08 12:08:06 -03:00
Mike Jolley a661feccba Merge pull request #16162 from woocommerce/feature/discounts-class
Cart Total and Discounts classes
2017-08-08 15:58:32 +01:00
Mike Jolley e9c3ebebdc Merge branch 'master' into feature/discounts-class
# Conflicts:
#	includes/abstracts/abstract-wc-data.php
#	woocommerce.php
2017-08-08 15:49:59 +01:00
Claudiu Lodromanean 591dbd5a82 Merge pull request #16303 from woocommerce/feature/discount-cart-integration
Integrate WC_Cart_Totals with Cart
2017-08-08 07:34:36 -07:00
Mike Jolley fe143df02c Merge branch 'pr/14751' 2017-08-08 15:30:00 +01:00
Mike Jolley 3778918a0a Merge branch 'master' into pr/14751
# Conflicts:
#	includes/class-wc-structured-data.php
2017-08-08 15:28:31 +01:00
Mike Jolley 396faa19d7 phpcs 2017-08-08 15:25:32 +01:00
Mike Jolley 90f0a835b1 Fix filename image handling 2017-08-08 15:00:03 +01:00
Mike Jolley 93f93e3d5e Merge branch 'pr/16191' 2017-08-08 13:20:28 +01:00
Mike Jolley 866f1cd818 Merge branch 'master' into pr/16191
# Conflicts:
#	includes/wc-account-functions.php
2017-08-08 13:20:17 +01:00
Mike Jolley 81e3ce63b7 Merge branch 'pr/16164' 2017-08-08 13:12:45 +01:00
Mike Jolley a97d3470db Merge branch 'master' into pr/16164
# Conflicts:
#	includes/class-wc-cache-helper.php
2017-08-08 13:12:37 +01:00
Mike Jolley 73eb086696 Merge branch 'pr/16165' 2017-08-08 13:10:16 +01:00
Mike Jolley 2f6aaa85bb Avoid using meta directly 2017-08-08 13:04:27 +01:00
Mike Jolley 63d82cea71 Merge branch 'pr/16108' 2017-08-08 12:44:50 +01:00
Mike Jolley 735a277e52 initial state 2017-08-08 12:44:36 +01:00
Mike Jolley 19d0841b70 Merge pull request #16340 from grey-rsi/wc-emails-filters
Add filters to make possible send emails in language different from d…
2017-08-08 11:53:36 +01:00
Mike Jolley 202498298e Merge pull request #16374 from woocommerce/fix/12273-4
Product attributes helper functions implementation
2017-08-08 11:51:38 +01:00
Emil Kjær Eriksen ee830d19b4 Store status_transition in a local variable and reset it before firing hooks 2017-08-08 12:47:16 +02:00
Mike Jolley a4b81c2a22 Merge pull request #16252 from helgatheviking/issues-16221-settings-save-order
Move settings init/save to load-$settings hook. Closes #16221
2017-08-08 11:40:17 +01:00
Mike Jolley 38d9499c76 Merge branch '12273-3' 2017-08-08 11:07:43 +01:00
Mike Jolley 684a2b22ed typo 2017-08-08 11:07:36 +01:00
Mike Jolley e7ff4186eb remove include 2017-08-08 10:52:54 +01:00
Mike Jolley ceb191e73e The world is not ready for WC_Cart_Item 2017-08-08 10:52:31 +01:00