Commit Graph

21002 Commits

Author SHA1 Message Date
Mike Jolley a1ff66fbe7 Merge remote-tracking branch 'origin/master' 2017-04-27 18:05:40 +01:00
Mike Jolley d0ebf48da4 Merge branch 'fix-13625'
# Conflicts:
#	assets/css/woocommerce-layout-rtl.css
#	assets/css/woocommerce-layout.css
#	assets/css/woocommerce-layout.scss
#	includes/wc-core-functions.php
2017-04-27 18:05:34 +01:00
Claudio Sanches c58a6f42e3 Merge pull request #14604 from cristiangrama/fix-filter-guest-orders
Fetch only guest orders: Allow passing a `customer=0` filter on the order request
2017-04-27 14:04:19 -03:00
Mike Jolley ad578137be No need to wrap - leave styling to themes 2017-04-27 18:03:42 +01:00
Mike Jolley 56d190287e Merge pull request #14755 from woocommerce/fix/14736
On multisite, add user to blog during checkout if not a user
2017-04-27 17:46:54 +01:00
Mike Jolley e143a51cc7 Merge pull request #14463 from woocommerce/add/show-shipping-calculator-variable
Add variable so shipping calculator is shown on first row
2017-04-27 17:41:48 +01:00
Mike Jolley 8869cb3c2a First to false at loop end 2017-04-27 17:41:25 +01:00
Mike Jolley 0d89250b3f Merge pull request #14748 from woocommerce/fix/stock-in-cart-notice
Correct the stock display notice when a variable product manages stock for it's children
2017-04-27 17:38:59 +01:00
Mike Jolley ca0c3e0bb8 Merge pull request #14064 from rafsuntaskin/develop
added bulk variation update for stock status, resolves #14046
2017-04-27 17:37:59 +01:00
Mike Jolley c247909e78 Merge branch 'pr/14375' 2017-04-27 17:32:47 +01:00
Mike Jolley cd4e23a864 Use correct classnames and tidy 2017-04-27 17:32:36 +01:00
Mike Jolley a68934d7db Merge pull request #14731 from crodas/make_sure_meta_data_cache_is_not_shared
Make sure the meta data cache is not shared among instances
2017-04-27 16:50:10 +01:00
Mike Jolley 4e8de076d2 Merge pull request #14740 from woocommerce/fix/14452
Fixed how to flush rewrite rules after save the shop main page
2017-04-27 16:44:25 +01:00
Claudio Sanches 1bf2902762 Check if get_current_screen() is true 2017-04-27 12:42:16 -03:00
claudiulodro 6aecb15505 Reduce scope 2017-04-27 08:38:18 -07:00
Mike Jolley 891e55e1cf Merge pull request #14721 from woocommerce/fix/14670
Avoid escaped quote chars in strings
2017-04-27 15:34:27 +01:00
Mike Jolley fc0f5f3765 fix test 2017-04-27 15:23:04 +01:00
Mike Jolley eedcdd97ba Compare with timestamp and remove start date once passed for sale products
Fixes #14753
2017-04-27 14:35:33 +01:00
Mike Jolley 52612435e3 minify 2017-04-27 13:55:04 +01:00
Mike Jolley 1959f5bc84 Merge pull request #14739 from helgatheviking/issue-14738/select2-sortable-cursor
Fix the move cursor for sortable select2 inputs.
2017-04-27 13:54:21 +01:00
Mike Jolley a283351ef8 On multisite, add user to blog during checkout if not a user
Fixes #14736
2017-04-27 13:48:45 +01:00
Mike Jolley a6329fa68c Merge pull request #14752 from woocommerce/pr/14732
revert price handling of get_price_html()
2017-04-27 13:03:15 +01:00
Mike Jolley db5e2572f6 clean up 2017-04-27 13:01:52 +01:00
Mike Jolley aacb01d1e7 Merge branch 'pr/13503'
# Conflicts:
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-layout.css
#	assets/css/woocommerce-layout.scss
#	assets/css/woocommerce.css
2017-04-27 12:46:05 +01:00
Mike Jolley 5f63f81b72 Merge branch 'add/inline-terms'
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-04-27 12:37:46 +01:00
Mike Jolley 115da407c0 Correct notice 2017-04-27 12:34:20 +01:00
Mike Jolley 62e51fd090 Merge branch 'maybe_blank_keys_webhooks' 2017-04-27 12:23:28 +01:00
Mike Jolley 3403e39740 Add icons and fix links 2017-04-27 12:23:16 +01:00
Mike Jolley bbffbd6a9f Merge branch 'master' into maybe_blank_keys_webhooks 2017-04-27 12:11:27 +01:00
Mike Jolley 8f5a8b0ede Merge pull request #13898 from rellect/sass_woocommerce
Remove deep nesting where not necessary (woocommerce.scss)
2017-04-27 12:07:29 +01:00
Mike Jolley de54358650 Merge pull request #13896 from rellect/sass_admin
Remove deep nesting where not necessary (admin.scss)
2017-04-27 12:05:26 +01:00
Mike Jolley 29feafb116 Merge branch 'pr/14414' 2017-04-27 12:01:45 +01:00
Mike Jolley 2e77b0f417 Keep both classes 2017-04-27 12:01:37 +01:00
Mike Jolley 7c037728f6 Merge branch 'fix/14448'
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-04-27 12:00:05 +01:00
Mike Jolley d546613c25 Merge branch 'pr/14394'
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-04-27 11:53:08 +01:00
Mike Jolley a4f7bb3d6e Remove extra comma 2017-04-27 11:52:10 +01:00
Mike Jolley a5018f5531 Merge pull request #13409 from diggy/patch-1
filter recent reviews dashboard widget query
2017-04-27 11:41:36 +01:00
Mike Jolley cf35375260 Merge branch 'pr/13712' 2017-04-27 11:39:44 +01:00
Mike Jolley 7e056adbae Revise menu titles to match wp admin 2017-04-27 11:39:34 +01:00
Mike Jolley 60a5ecf775 Merge pull request #13761 from franticpsyx/sold-individually-found-in-cart
[3.1] Add woocommerce_add_to_cart_sold_individually_found_in_cart hook
2017-04-27 11:32:33 +01:00
Mike Jolley 57229d4b20 Merge pull request #14589 from woocommerce/add/shipping-zone-setup-in-wizard
Automatic Shipping Zone Creation In Setup Wizard
2017-04-27 11:28:23 +01:00
Mike Jolley d9e3b78cfa Merge remote-tracking branch 'origin/master' 2017-04-27 11:26:56 +01:00
Mike Jolley 3ceef69350 Merge branch 'pr/14491' 2017-04-27 11:26:52 +01:00
Mike Jolley 38279a72f3 version 2017-04-27 11:26:44 +01:00
Mike Jolley 2660f994e6 Merge pull request #14551 from hussong/patch-1
Change field label and placeholder to minimize user error
2017-04-27 11:25:49 +01:00
Mike Jolley dac36505c2 Correct the stock display notice when a variable product manages stock for it's children 2017-04-27 11:03:56 +01:00
Mike Jolley 2cd490a372 Merge pull request #14714 from woocommerce/fix/14693
Fix handle position
2017-04-27 10:42:40 +01:00
Claudio Sanches dbddcaf95f Fixed how to flush rewrite rules after save the shop main page
Fixes #14452
2017-04-26 21:51:30 -03:00
Kathy Darling a6b0100cb4 Fix the move cursor for sortable select2 inputs. partially closes #14738. 2017-04-26 17:39:26 -05:00
claudiulodro 020e24225a Line up array 2017-04-26 14:20:44 -07:00