Commit Graph

12779 Commits

Author SHA1 Message Date
Shiva Poudel 3976b568e2 Merge remote-tracking branch 'upstream/onboarding' into nav-margin 2015-06-11 18:36:00 +05:45
Mike Jolley a3ed5efcd9 Merge pull request #8351 from MikeHansenMe/master
Fix broken password reset
2015-06-11 10:43:15 +01:00
Mike Jolley 2036e41e83 Minify #8356 2015-06-11 10:31:25 +01:00
Mike Jolley d50a2d4456 Merge pull request #8356 from justinshreve/color-picker-preview
Improve the color picker preview visibility by moving the preview to its own element (#8355)
2015-06-11 10:29:59 +01:00
Justin Shreve 99d198c148 Merge the preview and input boxes together visually 2015-06-11 07:54:45 +00:00
Justin Shreve 5f627cf850 Move the color preview to its own separate "preview box" rather then changing the color of the input div box. 2015-06-11 07:15:51 +00:00
Mike Hansen 819f22df29 Update wc-page-functions.php 2015-06-10 17:53:34 -06:00
Claudio Sanches 74f8e399d1 Merge pull request #8348 from aelia-co/master
Fixed class reference in PayPal IPN class
2015-06-10 19:01:58 -03:00
Diego Zanella 1faae5f4f5 Fixed reference in PayPal IPN class
* Using __CLASS__ in valid_response() prevents inheritance, as __CLASS__ is always resolved as the parent class. A descendant class would have to copy/paste the whole block of code for it to work correctly. Solution: replaced it with $this, as the valid_response() method is not static, and neither are any of the "payment_status_" methods.
2015-06-10 19:17:37 +01:00
Diego Zanella f44741540f Merge remote-tracking branch 'upstream/master' 2015-06-10 19:13:33 +01:00
Claudio Sanches 866a975517 Minify files for #8347 2015-06-10 14:50:13 -03:00
Claudio Sanches fbbbbaf4e9 Merge pull request #8347 from shivapoudel/cart-jshint
Tweaks JSHint for cart and cart fragments
2015-06-10 14:45:28 -03:00
Mike Jolley f3951a7490 [2.3] Fallback to serialized data if safe. 2015-06-10 18:28:34 +01:00
Mike Jolley aaaef5bfcf [2.3] Incorrect wc_product_total_stock_ transient
Closes #8337
2015-06-10 18:28:34 +01:00
Mike Jolley 21773ff9ba [2.3] JSON encode/decode PayPal response 2015-06-10 18:28:33 +01:00
Shiva Poudel 8aff509ed7 Tweaks JSHint for cart and cart fragments 2015-06-10 23:11:21 +05:45
Claudio Sanches 157a22a79c Merge pull request #8345 from justinshreve/product-api-download-url-8335
[2.3] Run URLs through esc_url_raw instead of wc_clean in the Products API (#8335)
2015-06-10 13:24:23 -03:00
Justin Shreve 66ccc8a75c Only run the file URL through esc_url_raw if it looks like an absolute URL, otherwise if it is a shortcode or relative URL, continue to use wc_clean. 2015-06-10 16:12:10 +00:00
Justin Shreve 7c3774e65f For file URLs and images, run the URL through esc_url_raw rather than wc_clean (which removes/strips things like entities). 2015-06-10 15:34:36 +00:00
Claudio Sanches fa026ea49d Normalize the "Order #" #8305 2015-06-10 12:09:18 -03:00
Claudio Sanches 12c81120ca Merge pull request #8305 from WPprodigy/patch-3
Make the hash translatable/filterable
2015-06-10 11:45:36 -03:00
Claudio Sanches 3842dc6a69 Merge pull request #8341 from jconroy/nested_p_within_ul
Incorrectly nested p tag within ul
2015-06-10 11:28:31 -03:00
Claudio Sanches c9c3be6d3e [API] Use settings to auto generate passwords or not, closes #8342 2015-06-10 10:56:25 -03:00
Jason Conroy 1061487d7c Incorrectly nested p tag within ul 2015-06-10 19:33:07 +10:00
Claudio Sanches 3c701124ec Merge pull request #8338 from BFTrick/remove-community-forum
Removing References to the Community Forum
2015-06-09 17:16:57 -03:00
Patrick Rauland 2d69a0d9c9 removing references to the community forum 2015-06-09 13:55:05 -06:00
Claudio Sanches eefd9a24f1 Merge pull request #8330 from justinshreve/api-tax-rounding-8328
Stop using the frontend display setting for tax rounding in the API (#8328)
2015-06-09 13:09:46 -03:00
Claudio Sanches f333bb68b2 Improved js for widget layered nav #8332 2015-06-09 13:06:50 -03:00
Mike Jolley 11a858ec3e Merge pull request #8333 from justinshreve/download-linebreaks-8327
Add a line break after every download file link (fixes #8327)
2015-06-09 17:05:27 +01:00
Claudio Sanches 16ddd24887 [2.3] Fixed & and , for layered nav dropdowns, closes #8332 2015-06-09 12:49:57 -03:00
Claudio Sanches c02052a206 [API] Stop undefined index erros for variations in orders endpoint
@justinshreve
2015-06-09 12:39:37 -03:00
Justin Shreve 54586115b7 Add a line break after every download file link is outputed in the email order items template. 2015-06-09 15:38:21 +00:00
Shiva Poudel b907cc4374 Tweak nav tab margin for pretty messages
CC @mikejolley
2015-06-09 21:01:23 +05:45
Mike Jolley a148e867b0 [2.3] Fix sale item exclusion logic for variations
Closes #8324
2015-06-09 16:10:46 +01:00
Justin Shreve 1d8b6a58d6 Avoid rounding subtotal_tax and total_tax. Don't call wc_round_tax_total for subtotal, and avoid the call to get_line_tax directly which also calls wc_round_tax_total. 2015-06-09 15:06:30 +00:00
Mike Jolley 12eb7aa207 Move dashboard link to footer 2015-06-09 15:54:46 +01:00
Claudio Sanches c353a3a9ea Minify files 2015-06-09 11:37:04 -03:00
Mike Jolley 922ca47cc1 [2.3] woocommerce_downloadable_file_exists filter 2015-06-09 15:27:28 +01:00
Claudio Sanches db8b343532 Merge pull request #8322 from justinshreve/api-product-variation-7951
Take product variation into account when creating orders from the API (fixes #7951)
2015-06-09 11:20:44 -03:00
Mike Jolley 9009b334e7 Merge branch 'test-price-filter' 2015-06-09 15:15:15 +01:00
Mike Jolley fe58e1b5e9 Account for tax classes 2015-06-09 14:58:27 +01:00
Mike Jolley 4df7083dac Merge pull request #8323 from justinshreve/json-search-permissions-check-8321
[2.3] Switch the ajax json_search_* functions to check for the read_product capability
2015-06-09 14:06:03 +01:00
Justin Shreve 651b65f28e Add a unit test for get_variation_id so we know we are getting back the IDs that we want 2015-06-09 13:02:02 +00:00
Justin Shreve 937f93faa6 Clean up some naming and add a clarifying comment for the attribute & pa_ stripping. 2015-06-09 12:41:06 +00:00
Justin Shreve 251636c02e First pass at figuring out what the variation ID is based on variation information being passed in via the API. 2015-06-09 12:41:06 +00:00
Justin Shreve a7891750b7 Switch the permissions check for json_search_products to use the read_product capability. 2015-06-09 12:35:33 +00:00
Justin Shreve 3233eb471e Switch the json_search_products and json_search_downloadable_products_and_variations ajax functions to check for the `edit_shop_orders` cap instead of `edit_products`. 2015-06-09 12:35:33 +00:00
Mike Jolley eb4b9a7cd1 Merge pull request #8304 from krautnerds/quick-fix-variation-admin-stock-display
Quick fix stock display for product variations
2015-06-09 12:24:55 +01:00
Mike Jolley 6c557c21e5 woocommerce_duplicate_product_exclude_children, woocommerce_duplicate_product_exclude_meta, woocommerce_duplicate_product_exclude_taxonomies
Closes #8271
2015-06-09 12:07:29 +01:00
Mike Jolley 34f8536b20 Merge pull request #8306 from krautnerds/fix-customer-rest-api-pagination
Fixed pagination headers for customer REST API
2015-06-09 11:43:27 +01:00