Commit Graph

15853 Commits

Author SHA1 Message Date
Mike Jolley cf06f69b6b Merge remote-tracking branch 'origin/master' 2016-05-16 10:17:55 +01:00
Mike Jolley ca815f9fdc Merge branch 'pr/10914' 2016-05-16 10:17:51 +01:00
Mike Jolley ba2bfdc685 Fix invalid closing tag 2016-05-16 10:17:44 +01:00
Mike Jolley cdf2e44889 Merge pull request #10919 from WPprodigy/duplicate-filter-fix
Remove an unnecessary filter
2016-05-16 10:16:04 +01:00
Mike Jolley 557bd9e8b7 Merge pull request #10917 from kreamweb/master
Add check of $raw_countries before the foreach in WC_Countries
2016-05-16 10:12:45 +01:00
Mike Jolley 9fe8a1bcdb Merge pull request #10915 from woothemes/variation-no-parent-fix
Prevent variations being created/returned without parents
2016-05-16 10:12:14 +01:00
Mike Jolley fb0358ee07 Wrap currency symbol in span 2016-05-16 10:11:05 +01:00
Caleb Burks e707adedd4 Remove a duplicate filter 2016-05-15 00:41:52 -05:00
kreamweb 0a2c0af5ff Add check of $raw_countries before the foreach in WC_Countries 2016-05-14 11:02:05 +02:00
Mike Jolley d42d7c13b6 Prevent variations being created/returned without parents
Nasty bug discovered by @RiaanKnoetze where it would get a variation
without parent, and due to the return, it wouldn’t be ‘seen’ as a
variation, therefore creating fatal errors when props are called.

To prevent this, lets allow product constructors to throw exceptions.
If they do, the factory class will catch them and return false instead
of an invalid product object.

@claudiosmweb Thoughts on this one before merge?
2016-05-13 19:06:16 +01:00
Claudio Sanches 1f2cda5a49 Version 2.6.0-beta-2 2016-05-13 14:40:21 -03:00
Claudio Sanches f7fa2c64c3 Added missing textdomain 2016-05-13 14:39:55 -03:00
Mike Jolley 6e94df6ee5 must be > 0 to exist 2016-05-13 17:57:50 +01:00
corsonr becc4ef841 use wc_help_tip() 2016-05-13 18:49:58 +02:00
corsonr ca040a3d1f Add a refund reason help bubble 2016-05-13 18:15:35 +02:00
Mike Jolley 141dd2e7ef link to schema doc 2016-05-13 17:07:33 +01:00
Mike Jolley cf64786447 Full breadcrumbs in zones UI 2016-05-13 16:08:19 +01:00
Mike Jolley 668d3fa517 Only show return to shop link if shop page is set 2016-05-13 15:51:37 +01:00
Mike Jolley b0396004f0 Merge pull request #10906 from woothemes/add/wcc-related-tracker-data
Add additional information to the WC Tracker
2016-05-13 11:05:47 +01:00
Mike Jolley a3b4f25209 Merge pull request #10912 from woothemes/legacy-shipping-method-notice-tweak
Tweaking the legacy shipping notice.
2016-05-13 11:04:08 +01:00
Joey Kudish 3b59fd7af4 add additional information to the WC Tracker
* Some basic info about Jetpack version, if connected, and if is a staging site
* Some basic info about WooCommerce Connect, if installed and if active
2016-05-12 13:17:53 -07:00
Claudio Sanches 06dbc81d66 Always prevent default/return false #10907 2016-05-12 16:48:06 -03:00
Ryan Ray b57da86dee Made a tiny adjustment to the order of words and formatting. The sentence is a bit shorter and clearer (to me) now. 2016-05-12 14:22:48 -04:00
Mike Jolley 9c1aa8afe8 Merge pull request #10899 from woothemes/background-updates
Handle DB updates in the background
2016-05-12 16:45:42 +01:00
Mike Jolley 5f46f60cb0 Merge pull request #10907 from corsonr/confirm_delete_order_note
Add order note deletion confirmation
2016-05-12 12:26:26 +01:00
Mike Jolley 986bd5abc7 Fix save and striping 2016-05-12 12:18:35 +01:00
Mike Jolley 07db739a47 Revise link wording and page title 2016-05-12 11:37:48 +01:00
Mike Jolley 8be8fe4c8a Use modal for adding methods on both screens 2016-05-12 11:29:33 +01:00
Mike Jolley 3dba8e3697 Changed icons for methods into text based links and moved save buttons to left to match other settings screens 2016-05-12 11:07:18 +01:00
Mike Jolley b441a218a4 Remove logged in notice
Closes #10904
2016-05-12 10:36:27 +01:00
corsonr 52f3cb3d8a Add order note deletion confirmation 2016-05-12 10:04:32 +02:00
Claudio Sanches 9635a00b93 Fixed term_id override while trying to get term order_
Some old or imported product taxonomy terms don't have any order_ fields
in the wp_termdata and this will return a empty term_id that will
override the WP regular query.

This change avoid override term_id and allow the query work without any
additional data migration.

Closes #10903

cc @mikejolley
2016-05-11 19:33:55 -03:00
Claudio Sanches fb57390da3 Merge pull request #10902 from mindsize/variation-sku-fix
Variation sku fix
2016-05-11 16:46:40 -03:00
Claudio Sanches 5b916de27a Updated WP-API vendor files 2016-05-11 16:43:51 -03:00
Zach Stepek c96cd1e4d3 Merge branch 'master' into variation-sku-fix
# Conflicts:
#	assets/js/frontend/add-to-cart-variation.min.js
2016-05-11 14:41:39 -05:00
Zach Stepek b1a70ddb96 Merge remote-tracking branch 'upstream/master' 2016-05-11 14:37:26 -05:00
Claudio Sanches 2b1d4eced6 [REST API] Allow batch create, update and delete for almost all endpoints 2016-05-11 16:34:53 -03:00
Claudio Sanches dac471273f Merge pull request #10884 from woothemes/wp-api-batch
[REST API] Batch create, update and delete items
2016-05-11 16:22:54 -03:00
Zach Stepek 50a7b07496 Update specificity of jQuery selector used to reset SKU in product-meta 2016-05-11 12:25:56 -05:00
Claudio Sanches ccd1f48025 [REST API] Save default total_sales, closes #10898 2016-05-11 13:19:56 -03:00
Claudio Sanches 47ef7e17a1 Created new function to generate webhook secrets based on the user ID and username, closes #10881 2016-05-11 13:14:00 -03:00
Mike Jolley c1830c12cc Redirect to install page w/ nonce
Fixes #10860
2016-05-11 17:01:34 +01:00
Mike Jolley c9095abf8e Save line taxes for shipping rows
Fixes #10897
2016-05-11 16:32:51 +01:00
Mike Jolley aa3dab3572 Resize modal content dynamically
Fixes #10896
2016-05-11 16:19:22 +01:00
Claudio Sanches 35fdcd243a [REST API] Added method to check if the request is to the rest api and allow third party plugins 2016-05-11 11:52:29 -03:00
Mike Jolley 2cc0ac294e Fix return on add_metadata
Fixes #10892
2016-05-11 15:28:40 +01:00
Mike Jolley d1da61a954 Remove update files 2016-05-11 14:26:54 +01:00
Mike Jolley 99cd5187c0 Merge branch 'master' into background-updates
# Conflicts:
#	includes/updates/woocommerce-update-2.4.php
#	includes/updates/woocommerce-update-2.6.php
2016-05-11 14:26:37 +01:00
Mike Jolley e716993809 Store instance ID transitions to option and fire action
Closes #10883 @franticpsyx
2016-05-11 14:25:31 +01:00
Mike Jolley a7176ae543 this is a legacy update 2016-05-11 14:25:31 +01:00