Commit Graph

24204 Commits

Author SHA1 Message Date
Gerhard Potgieter 98a382174c Merge branch 'feature/webhook-crud' into feature/webhook-delivery-logging 2017-11-17 08:48:57 +02:00
Claudio Sanches 94ae9678c8 Merge branch 'master' into feature/webhook-crud 2017-11-16 12:21:56 -02:00
Claudio Sanches 9fe0c7261e Merge branch 'master' into feature/webhook-crud 2017-11-16 12:20:22 -02:00
Mike Jolley 40fdff510c
Merge pull request #17729 from woocommerce/fix/skip-wp_kses_post
Skip wp_kses_post call on image
2017-11-16 13:18:08 +00:00
Mike Jolley d3d6a47221 readme update 2017-11-16 13:16:28 +00:00
Boro Sitnikovski fe9b9658a5 Skip wp_kses_post call on image 2017-11-16 13:48:04 +01:00
Mike Jolley 67144be628
Merge pull request #17727 from woocommerce/fix/get_object_subtotal
Fix variable in get_object_subtotal
2017-11-16 12:03:58 +00:00
Mike Jolley 72b3b5055b FIx variable in get_object_subtotal 2017-11-16 12:03:02 +00:00
Mike Jolley 541dde95b3
Merge pull request #17710 from woocommerce/fix/17697-coupon-spend-incl-taxes
Coupon min/max spend based on displayed subtotal
2017-11-16 10:59:43 +00:00
Gerhard Potgieter a59f325f41 Add get_object_subtotal helper method, remove subtotal variable in favor of helper method 2017-11-16 12:43:50 +02:00
Gerhard Potgieter 3af77f13d8 Change tooltip to just say subtotal 2017-11-16 12:28:43 +02:00
Claudiu Lodromanean 6c82861522
Merge pull request #17716 from woocommerce/fix/use-add_filter
Use `add_filter` for `comment_feed_where` hook.
2017-11-15 14:37:34 -08:00
Claudiu Lodromanean 6b3fd8e403
Merge pull request #17715 from woocommerce/update/17601
Variation add to cart logic
2017-11-15 14:35:52 -08:00
Claudiu Lodromanean f05ca1176c
Merge pull request #17714 from woocommerce/fix/17630
Fix event propagation on click
2017-11-15 14:32:44 -08:00
Akeda Bagus 6ae10e64e2
Use `add_filter` for `comment_feed_where` hook. 2017-11-16 00:43:12 +07:00
The Dramatist 31155ed531 Woocommerce download readfile chunk number hook proposal (#17699)
* A hook proposal to modify the chunk number.

`woocommerce_download_readfile_chunk_number` hook is proposed to make modifying the chunk number easily.

* Constant IMO declared for changeable chunk size. 

New constant `WC_CHUNK_SIZE` declared to make `WC_Download_Handler` class's `readfile_chunked` method's chunk size changeable.
2017-11-15 16:32:28 +00:00
Mike Jolley c92f61d6d4 Variation add to cart logic 2017-11-15 16:29:04 +00:00
Mike Jolley 17710b864d Tweak IPN setting wording
@claudiulodro
2017-11-15 15:12:52 +00:00
Mike Jolley cbc16f7e2b Min 2017-11-15 14:34:42 +00:00
Mike Jolley 36ce76434a Fix propagation on click
Fixes #17630
2017-11-15 14:34:35 +00:00
Mike Jolley cbc143e021
Merge pull request #16700 from woocommerce/tweak/order-screens
Order screen simplification, preview function, and list table refactor.
2017-11-15 14:13:54 +00:00
Mike Jolley 56d86aee96 trashed styling 2017-11-15 13:41:20 +00:00
Mike Jolley 128b826791 Merge branch 'master' into tweak/order-screens
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	includes/admin/class-wc-admin-post-types.php
2017-11-15 13:36:13 +00:00
Mike Jolley 4b3f8817cf Responsive styles 2017-11-15 13:30:39 +00:00
Mike Jolley dea454c88e Clickable elements 2017-11-15 12:51:14 +00:00
Mike Jolley e0bb7b35fd Cursors 2017-11-15 12:35:41 +00:00
Mike Jolley 4bb7bcd3af Fix sorting position 2017-11-15 12:32:02 +00:00
Gerhard Potgieter 3524ed2cf0 Merge branch 'master' of github.com:woocommerce/woocommerce into feature/webhook-delivery-logging 2017-11-15 14:28:14 +02:00
Mike Jolley da004f3229 fix edit link 2017-11-15 12:25:44 +00:00
Gerhard Potgieter 4521011219 Adjust discount on min/max spend to work based on the displayed subtotal. 2017-11-15 13:44:07 +02:00
Mike Jolley ef4859aaf0
Merge pull request #17711 from woocommerce/update/17502
Improve the Add Payment Methods display
2017-11-15 11:05:11 +00:00
Mike Jolley bb2e506a2b Tweak wording 2017-11-15 11:04:20 +00:00
Mike Jolley 599b10b286 Merge branch 'pr/17664' 2017-11-15 10:31:40 +00:00
Mike Jolley 9e2786a0a3 Today up logic 2017-11-15 10:31:31 +00:00
Gerhard Potgieter 0436e9afcb Rework tax calculations to work with inclusive and exclusive pricing 2017-11-15 12:23:52 +02:00
Mike Jolley 6a8966382d Merge branch 'pr/17690' 2017-11-15 10:21:49 +00:00
Mike Jolley e9bbb3a10f phpcs 2017-11-15 10:21:38 +00:00
Mike Jolley 76adff572e woocommerce_recently_viewed_products_widget_query_args filter
Closes #17678
2017-11-15 10:19:11 +00:00
Gerhard Potgieter 8cbca4d9d9 Include taxes in minimum and maximum coupon validation checks. 2017-11-15 12:04:02 +02:00
Mike Jolley 8dcd7f5b59
Merge pull request #17696 from yratof/patch-1
Removed class within class for admin meta boxes
2017-11-15 10:02:19 +00:00
Mike Jolley bff529878e
Merge pull request #17709 from shivapoudel/revert-17356-backbonejs-changes
Revert "Add correct method to define new in a backbone"
2017-11-15 09:59:39 +00:00
Shiva Poudel 07784c3ee2
Revert "Add correct method to define new in a backbone" 2017-11-15 11:24:10 +05:45
Claudiu Lodromanean 4db2a8aa69
Merge pull request #17702 from glagonikas/master
PayPal IPN email notifications should be optional
2017-11-14 15:00:23 -08:00
George Lagonikas 6b7cc782d2
Removing obsolete code 2017-11-14 22:30:28 +00:00
George Lagonikas bca6bc7375
Text changes 2017-11-14 20:31:39 +00:00
George Lagonikas 87a75ce96e
Simplifying logic 2017-11-14 20:30:49 +00:00
Claudiu Lodromanean cc5c182f9d
Merge pull request #17679 from woocommerce/update/12517-download-reporting
Download reporting
2017-11-14 12:23:01 -08:00
Mike Jolley a3c97c4a6a
Merge pull request #17703 from woocommerce/new-placeholder-image
New placeholder image
2017-11-14 19:54:23 +00:00
kellychoffman ac73427905 new placeholder image
in the style of the new dummy-data product illustrations
2017-11-14 12:50:40 -07:00
SGroupGeorge 64332d82c7 Text changes 2017-11-14 17:51:46 +00:00