Commit Graph

12649 Commits

Author SHA1 Message Date
Claudio Sanches 9e4dc64f55 Merge branch 'master' of github.com:woothemes/woocommerce 2015-07-10 20:17:27 -03:00
Claudio Sanches b8a28bdab4 Admin variations - Cancel button reset the default form values
@mikejolley
2015-07-10 20:16:35 -03:00
Mike Jolley 86e0aa106e bulk_edit 2015-07-11 00:05:13 +01:00
Mike Jolley 3ec4003bbb Move add variation button and toolbars 2015-07-11 00:04:16 +01:00
Claudio Sanches 8b4711f655 Admin variations - Removed alert when add new variation 2015-07-10 19:30:14 -03:00
Claudio Sanches 441d3c44bb Admin variations - Go to previous page when delete the last variation in a page 2015-07-10 18:57:38 -03:00
Claudio Sanches 501742b07f Updated grunt dependencies 2015-07-10 18:48:04 -03:00
Claudio Sanches ae17f9e786 Updated grunt dependencies 2015-07-10 18:34:15 -03:00
Claudio Sanches e0c1cc7784 Admin variations - Turn on save button when add new variation 2015-07-10 18:31:38 -03:00
Claudio Sanches e9fc799f97 Admin variations - Fix product add and save methods
Allow add new variations and stay at the same page
When save will set up the pagination again

@mikejolley
2015-07-10 18:22:05 -03:00
Claudio Sanches 2841d67340 Merge pull request #8557 from pmgarman/patch-1
Update WC_Logger to include actions on add & clear methods
2015-07-10 16:45:16 -03:00
Claudio Sanches c63faa76a8 Escape proceed-to-checkout-button.php template 2015-07-10 16:42:33 -03:00
Claudio Sanches 969d678ab5 Merge pull request #8555 from Ninos/hooks
Add hook e.g. for woocommerce german market (variable.php)
2015-07-10 16:40:20 -03:00
Patrick Garman fb84486798 Update WC_Logger to include actions on add & clear methods
This allows for easy integrating with third party logging services.
2015-07-10 14:26:30 -05:00
Ninos Ego 147c589bda Add hook e.g. for wgm 2015-07-10 16:37:52 +02:00
Claudio Sanches a01660cbba Fixed WC_API_Products::clear_product() 2015-07-10 10:49:18 -03:00
Mike Jolley 157503a6d3 20 not 25 2015-07-10 14:26:39 +01:00
Mike Jolley 3446880705 Translators 2015-07-10 14:02:52 +01:00
Mike Jolley 33877624ac Welcome page content 2015-07-10 14:00:21 +01:00
Mike Jolley 3adbf76add 2.4 Readme 2015-07-10 12:25:23 +01:00
Mike Jolley 2834eff221 Merge branch 'variations-8477'
Conflicts:
	assets/js/frontend/add-to-cart-variation.js
	assets/js/frontend/add-to-cart-variation.min.js
	assets/js/frontend/add-to-cart.min.js
	assets/js/frontend/checkout.min.js
	assets/js/frontend/geolocation.min.js
2015-07-10 11:37:05 +01:00
Mike Jolley 1cd2e558ed Remove add to cart variable from links
Closes #8554
2015-07-10 11:17:21 +01:00
Mike Jolley 8bf4469178 woocommerce_save_account_details_errors action
Closes #8532
2015-07-10 11:11:51 +01:00
Mike Jolley ea82ce9f06 Tweak display name to only change if set to an email
#8532
2015-07-10 11:09:14 +01:00
Mike Jolley a976d8e2ba Don't add hyphens for cities
Closes #8547
2015-07-10 11:02:08 +01:00
Mike Jolley e90dddb12f Merge branch 'pr/8553' 2015-07-10 10:48:40 +01:00
Mike Jolley d5a74203c2 Only need one numeric check 2015-07-10 10:48:29 +01:00
nils-fredrik@maksimer.no 3c2b54b360 Fix for #8550 2015-07-10 09:32:10 +02:00
Claudio Sanches ab4bff9f2f Grunt - Test with jshint before uglify files, closes #4680 2015-07-10 02:16:04 -03:00
Claudio Sanches 62d879e86c Fixed all jshint errors #4680 2015-07-10 02:13:30 -03:00
Claudio Sanches 76b312b9e7 Use always min.js files on admin 2015-07-10 01:32:30 -03:00
Claudio Sanches 319bcd48e6 Updated accounting.js 2015-07-10 01:31:57 -03:00
Claudio Sanches 987a789367 Admin variations - Show link all variations bulk action 2015-07-10 00:49:52 -03:00
Claudio Sanches 3394277a86 Admin variations - Set _stock_status when link all variations 2015-07-09 18:28:02 -03:00
Claudio Sanches c5ae7b18c7 Created woocommerce_ajax_save_product_variations action 2015-07-09 17:43:46 -03:00
Claudio Sanches a64695b7f5 Admin variations - Added new triggers and removed data-product_id 2015-07-09 17:31:48 -03:00
Claudio Sanches ce08c336e9 Updated jquery.payment.js to version 1.2.4 2015-07-09 17:17:34 -03:00
Claudio Sanches 3c409e07e1 Fixed js coding standards in assets/js/frontend/checkout.js 2015-07-09 15:04:00 -03:00
Mike Jolley 506b5ef3f6 Set total after update_shipping
Based on add_shipping code Closes #8475
2015-07-09 16:48:34 +01:00
Mike Jolley 60193c7861 Pass product to woocommerce_ajax_variation_threshold 2015-07-09 16:31:46 +01:00
Mike Jolley 9531258ee6 Treat each form separately. 2015-07-09 16:21:17 +01:00
Mike Jolley 30b01ff9b6 Add filter to force price display 2015-07-09 16:15:05 +01:00
Mike Jolley 85855938ec woocommerce_ajax_variation_threshold 2015-07-09 16:04:46 +01:00
Mike Jolley 5f8a5bcb63 We don't need get_transient_version for children transients because other products do not affect this. 2015-07-09 16:02:26 +01:00
Mike Jolley eaed944048 Tweak template logic to load variations when needed 2015-07-09 15:58:58 +01:00
Mike Jolley 65f19d5ca7 Ajax variation handling
If there are more variations than the threshold allows (set to 20
currently) this loads the matching variation via ajax instead of inline
in the HTML. #8477
2015-07-09 15:56:20 +01:00
Claudio Sanches c4c2ebd038 Merge pull request #8536 from vicky081/patch-3
Class attribute added for Checkbox in settings
2015-07-09 11:43:00 -03:00
Claudio Sanches e9c555702f Merge pull request #8544 from vicky081/patch-4
Return the output directly
2015-07-09 11:31:41 -03:00
Vignesh 91faacb4c9 Return the output directly
Return the output directly instead of variable.
2015-07-09 13:39:29 +05:30
Claudio Sanches ac8f18a721 Fixed unit tests
@mikejolley
2015-07-08 23:40:29 -03:00