Commit Graph

26424 Commits

Author SHA1 Message Date
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
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
Mike Jolley 386af1e94e
Merge pull request #17691 from woocommerce/feature/17448
Added support for single-product-postname.php template files
2017-11-15 09:41:56 +00:00
Mike Jolley 19cd9c4fd6 feedback 2017-11-15 09:41:26 +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
Chris Marslender 8f4720cb1c
remove the new line before the closing `}` for the order controller classes, to be consistent with other controllers 2017-11-14 19:44:29 -07:00
Chris Marslender 28500258bc
Move the orders/network endpoint to its own class, and extend the schema with the new fields 2017-11-14 19:42:31 -07:00
Chris Marslender a8ac58af79
Make table headings translatable 2017-11-14 19:05:44 -07:00
Chris Marslender e953bd3e68
Coding standards fixes for the API endpoint 2017-11-14 19:04:45 -07:00
Chris Marslender 2731de7461
Updates for coding standards 2017-11-14 18:59:20 -07:00
Chris Marslender f1fe210dba
Merge branch 'master' into feature/network-order-widget 2017-11-14 18:52:18 -07:00
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
claudiulodro db117d6344 Backordered products should count as in stock 2017-11-14 14:54:11 -08:00
George Lagonikas 6b7cc782d2
Removing obsolete code 2017-11-14 22:30:28 +00:00
claudiulodro 3050959836 Variations stock status 2017-11-14 14:18:03 -08:00
claudiulodro dbf6db9373 Show backordered items in admin menu 2017-11-14 13:56:56 -08:00
claudiulodro cf7bc61b99 Better code 2017-11-14 13:49:22 -08:00
claudiulodro c312cc35b1 Add new onbackorder stock status 2017-11-14 13:40:03 -08: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