Commit Graph

20778 Commits

Author SHA1 Message Date
Claudio Sanches 1bf2902762 Check if get_current_screen() is true 2017-04-27 12:42:16 -03: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
Cesar Rodas 91de312eb2 Make sure the meta data cache is not shared among instances
See #14620 for more context. In there I thought this was the desired behaviour and I enhanced it. After talking with @mikejolley he explained to me that it was not by designed.

This commit makes sure the meta data cache is not shared among instances
2017-04-26 13:51:52 -04:00
Kathy Darling 36dbe64170 revert price handling so null price still is filtered by woocommerce_get_price_html. closes #14727. 2017-04-26 12:37:30 -05:00
Mike Jolley ac0984f4e2 Merge pull request #14716 from woocommerce/fix/14674
Correctly migrate legacy shipping taxes data
2017-04-26 16:58:19 +01:00
Mike Jolley 88a6681347 Merge pull request #14713 from woocommerce/fix/14694
Don't strtolower address strings
2017-04-26 16:57:44 +01:00
Mike Jolley 165a8971ae Merge pull request #14712 from woocommerce/fix/14700
Add required placeholder for meta fields
2017-04-26 16:57:29 +01:00
Mike Jolley f4a4b9f61b Merge pull request #14723 from woocommerce/fix/14554
Hide notice only when updating
2017-04-26 15:12:02 +01:00
Mike Jolley 162ed72f8e Hide notice only when updating
Closes #14554
2017-04-26 15:02:13 +01:00
Mike Jolley 481a5045aa Merge pull request #14622 from jaumarar/patch-2
Fix: Creating customer triggers password changed
2017-04-26 14:32:28 +01:00
Mike Jolley ac96fe795a wc_attribute_taxonomy_id_by_name needs to use lowercase attribute slug
Fixes #14720
2017-04-26 14:28:47 +01:00
Mike Jolley 801f5e1eb1 Avoid escaped quote chars in strings
Closes #14670
2017-04-26 13:51:53 +01:00
Mike Jolley 13a610d1d8 Merge branch 'pr/14612' 2017-04-26 13:26:26 +01:00
Mike Jolley 13bc235020 Bump template version and move to correct function files. 2017-04-26 13:25:14 +01:00
Mike Jolley 1738464012 Correctly migrate legacy shipping taxes data
Fixes #14674
2017-04-26 12:17:34 +01:00
Mike Jolley 73adc1c493 Fix handle position
Closes #14693
2017-04-26 11:52:43 +01:00
Mike Jolley 076d2c9336 Minify 2017-04-26 11:43:12 +01:00