Commit Graph

24384 Commits

Author SHA1 Message Date
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
Mike Jolley da004f3229 fix edit link 2017-11-15 12:25:44 +00:00
Mike Jolley a57edb97a7 Use passed location 2017-11-15 12:14:55 +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
Gerhard Potgieter 0abac7b58e Log to a seperate log file dedicated to images 2017-11-15 10:34:28 +02:00
Gerhard Potgieter 14bc175241 Remove unused variable, make sure we have the wp image functions loaded before calling them. 2017-11-15 10:23:54 +02:00
Gerhard Potgieter 329f28f08b Fix SQL query for job queue processing, fix issue where admin images were trying to go through the image resize function. 2017-11-15 10:18:10 +02:00
Gerhard Potgieter 67d2b8e9c5 Use static variable on static class 2017-11-15 10:03:59 +02:00
Gerhard Potgieter c698b13f6c Completed background image regeneration using a job and queue. 2017-11-15 09:23:36 +02:00
Gerhard Potgieter 5af93f68ad Add basic background queue processing framework for image regeneration 2017-11-15 08:36:57 +02: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
SGroupGeorge 3b2eec75d3 Adding checkbox to make IPN emails optional 2017-11-14 17:34:48 +00:00
Andrew Lazarus ba52e583f9
Removed class within class
'<div class="class="wc-order-item-name"">` outputs `<div class="class=" wc-order-item-name="">`
2017-11-14 16:01:57 +01:00
Gerhard Potgieter 016cfabb75 On the fly image regeneration. 2017-11-14 14:39:28 +02:00
Mike Jolley babde741db Add add_to_cart_description method and aria-labels to cart buttons in the loop 2017-11-14 11:45:16 +00:00
Mike Jolley a50f30f792 Remove filter calling deprecated method 2017-11-14 10:21:29 +00:00
Mike Jolley 387093cd27
Merge pull request #17687 from rodrigoprimo/update/remove-unnecessary-travis-config
Travis configuration cleanup
2017-11-14 10:21:15 +00:00
Patrik Pärkinen 12d7bf72f3 #16694 Added sort speed fix to ascending sort as well 2017-11-14 11:19:35 +02:00
Claudiu Lodromanean 16d318c56d
Merge pull request #17685 from woocommerce/fix/17348
Introduced product category filter threshold
2017-11-13 14:38:40 -08:00
Claudio Sanches f27120f649 Introduced product category filter threshold and load categories dropdown
Only use WooSelect when have more than 100 terms
2017-11-13 19:47:48 -02:00
Claudio Sanches 487c039b1c Fixed coding standards 2017-11-13 19:40:10 -02:00
Claudio Sanches 416c11d0e6
Merge pull request #17684 from woocommerce/update/phpcs-paths
Improved PHPCS installed_paths and included Woo sanitization and escaping functions
2017-11-13 19:34:44 -02:00
Claudio Sanches fe21337203 Removed wc_format_decimal from escaping functions 2017-11-13 19:32:40 -02:00
Claudio Sanches 7a7cc3f3cd
Merge pull request #17680 from woocommerce/code-coverage-non-blocking
Generate code coverage report on a separate non-blocking Travis job
2017-11-13 19:26:27 -02:00
Claudio Sanches 9606d3e04b Ignore .sublimelinterrc 2017-11-13 19:18:34 -02:00
Claudio Sanches c62c394ed3 Autoload PHPCS dependencies 2017-11-13 19:18:21 -02:00
The Dramatist a25e871981 Parameter input, but checked wrong variable. (#17681)
Here `$offset` should be `$key`. Cause the parameter is named as `$key`.
2017-11-13 19:40:00 +00:00