Commit Graph

28073 Commits

Author SHA1 Message Date
therealgilles 43db16a708 Merge branch 'master' of https://github.com/woocommerce/woocommerce 2018-06-11 18:14:30 +00:00
Claudiu Lodromanean 2c1c32bf91
Merge pull request #20487 from willgorham/remove-malta-checkout-state
Remove Malta checkout 'State' field
2018-06-11 10:34:52 -07:00
Claudiu Lodromanean c93a922876
Merge pull request #20486 from woocommerce/fix/20430
sanitize_special_column_name_regex trim
2018-06-11 10:28:41 -07:00
Claudiu Lodromanean b351bcac50
Merge pull request #20483 from woocommerce/fix/20431
Search for matching keys when updating meta data
2018-06-11 10:26:24 -07:00
Claudiu Lodromanean 782fb95896 Update npm dependencies (#20459)
* Update npm dependencies

* Re-rebuild package-lock.json

* Update dependencies to newer versions
2018-06-11 14:23:31 -03:00
Brent Sessions 8fc43f0cad Skip upload from forks (#20462)
This will skip the uploading of screenshots if the S3 key is not present. This will happen when there is a PR for a fork submitted.

* Skip upload from forks

* trying with failing test

* Fixing tests

* need a rebuild
2018-06-11 13:59:59 -03:00
Claudiu Lodromanean 4ba04cfc4e
Merge pull request #20481 from woocommerce/update/20444
Remove personal data confirmation notice
2018-06-11 09:56:26 -07:00
Will Gorham 1d4f76490e Remove malta state field 2018-06-11 11:23:27 -04:00
Rodrigo Primo 397e40f165 Fix indentation 2018-06-11 11:14:04 -03:00
Rodrigo Primo 77add46705 Pass user_id via $wpdb->prepare() 2018-06-11 11:04:19 -03:00
Mike Jolley 38be26e7a5 sanitize_special_column_name_regex trim 2018-06-11 14:55:36 +01:00
Rodrigo Primo f1f49bb27a Add WC 3.5.0 DB version update callback 2018-06-11 10:54:02 -03:00
Rodrigo Primo 7f70c6372c Fix some code untitentional code changes added during the last merge from master 2018-06-11 10:48:28 -03:00
Rodrigo Primo dd8bf8b522 Merge branch 'master' into update/use-post-author-for-customer-id 2018-06-11 10:44:14 -03:00
Mike Jolley 7b13527ba5
Merge pull request #20345 from woocommerce/update/19686
Improved shipping calculator experience
2018-06-11 13:47:30 +01:00
Mike Jolley 588be3a780 merge master 2018-06-11 13:46:04 +01:00
Mike Jolley 663f7c4a76 click event fallback 2018-06-11 13:16:02 +01:00
Mike Jolley 90631bd48f
Merge pull request #20479 from woocommerce/fix/20477
X_FORWARDED_FOR IPv6 Support
2018-06-11 13:06:50 +01:00
Mike Jolley 52a7fafd74 Search for matching keys when updating meta data 2018-06-11 12:50:49 +01:00
Mike Jolley 5e14953796 Avoid price setting when synced with children 2018-06-11 11:44:58 +01:00
Mike Jolley 5b70639994 Prompt when removing personal data 2018-06-11 11:00:29 +01:00
Mike Jolley 35db31db32 Add notice text, fix typos 2018-06-11 10:35:34 +01:00
Roshan Sameer 32b734a1c1 Implementation of current action check in list table 2018-06-11 15:05:13 +05:45
Gerhard Potgieter 3b9d403b02 Add geolocation::get_ip_address tests 2018-06-11 11:10:11 +02:00
Gerhard Potgieter 90a9fd49e6 X_FORWARDED_FOR standard states either just an IP or a comma seperated list of IP, Proxy, Proxy, ... 2018-06-11 10:49:03 +02:00
therealgilles 9adff87a1c Rename woocommerce_checkout_skip_cart_is_empty_check to woocommerce_checkout_redirect_empty_cart and invert filter polarity. 2018-06-10 18:58:47 +00:00
therealgilles 1d733236e0 Merge branch 'master' of https://github.com/woocommerce/woocommerce 2018-06-10 18:53:13 +00:00
Khan M Rashedun-Naby 8d7ae8b413 Remove unused variable and unnecesary else if 2018-06-09 23:24:08 +06:00
Mike Jolley 4bc7841325 search_products limit support 2018-06-09 17:23:07 +01:00
Mike Jolley 81149157a3 woocommerce_json_search_limit filter 2018-06-09 17:22:26 +01:00
Bill Gouveros c68dc400ef shipping zone settings: fixed title for shipping methods w/o settings 2018-06-09 02:29:07 +03:00
Claudio Sanches a118d1d921
Merge pull request #20460 from JPry/update_contributing_guidelines
Update contributing guidelines
2018-06-08 15:58:25 -03:00
Claudiu Lodromanean 3d4dfda568
Merge pull request #20435 from rnaby/070618-212333-wc-privacy-exporters-customer_data_exporter
Removed unnecessary parameter. Also removed from tests.
2018-06-08 11:34:42 -07:00
Jeremy Pry 01e1ef73e7 Handle item limit for custom coupon types
Fixes #20455
2018-06-08 14:18:16 -04:00
Jeremy Pry a2d3313b36 Add unit tests around coupon item limit setting
Also updates the `WC_Helper_Coupon` class to make it easier to register custom coupon types during tests.

For #20455
2018-06-08 14:17:39 -04:00
Claudiu Lodromanean 0c8b8e9dd7
Merge pull request #20429 from woocommerce/fix/add-nonce-to-update-url
Add nonces to WC update database and force update database URLs
2018-06-08 10:52:17 -07:00
Jeremy Pry 2346183501 Include explicit mention of PHP 5.2 requirements 2018-06-08 13:23:58 -04:00
Claudiu Lodromanean 327401e4ea
Merge pull request #20406 from unfulvio/20404-custom-webhook-topic-dropdown-bug
[#20404] Fix custom webhook topic selection in dropdown
2018-06-08 09:43:50 -07:00
Mike Jolley 6a59a1b498
Merge pull request #20438 from rnaby/070618-215706-wc-privacy-exporters-get_customer_personal_data
PHPDoc @throws Tag Added
2018-06-08 17:27:18 +01:00
Mike Jolley baa5abcffa
Merge pull request #20437 from rnaby/070618-214301-wc-privacy-exporters-download_data_exporter
PHPDoc Fixed | Used Unused Variable | Else Removed
2018-06-08 17:27:05 +01:00
Mike Jolley f70e8b4bd2
Merge pull request #20436 from rnaby/070618-214347-wc-privacy-exporters-order_data_exporter
Made use unused variable and removed else
2018-06-08 17:26:47 +01:00
Mike Jolley 865e1337b0
Merge pull request #20457 from bekarice/fix/multisite-orders-widget
Fix multisite dashboard widget to use proper order number
2018-06-08 17:22:31 +01:00
Beka Rice 818c68fc83 Fix multisite dashboard widget to use proper order number 2018-06-08 11:59:27 -04:00
Mike Jolley e92463632b Held stock qty check for pay page 2018-06-08 16:58:33 +01:00
Jeremy Pry 2a1ed2c1cb Update the WP Coding Standards link 2018-06-08 11:31:45 -04:00
Mike Jolley d76474789d variable name 2018-06-08 16:30:58 +01:00
Mike Jolley 52854b7690 Add qty to order via modal, include stock qty in formatted name display for reference 2018-06-08 16:18:32 +01:00
Fulvio Notarstefano 468fb14c3c [#20404] Further indentation 2018-06-09 00:08:20 +09:00
Fulvio Notarstefano 38b1381fff [#20404] Code style standards 2018-06-09 00:07:20 +09:00
Rodrigo Primo c2616b74f2
Merge pull request #20439 from woocommerce/update/improve-e2e-screenshots
Only try to upload screenshots if directory is not empty
2018-06-08 09:34:45 -03:00