Commit Graph

27732 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
Mike Jolley 38be26e7a5 sanitize_special_column_name_regex trim 2018-06-11 14:55:36 +01: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 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 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
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
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
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
Jeremy Pry 2a1ed2c1cb Update the WP Coding Standards link 2018-06-08 11:31:45 -04: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
Claudiu Lodromanean dc20237f40
Merge pull request #20426 from woocommerce/fix/20386
Made path /orders/refund_id return invalid order id msg instead of error.
2018-06-07 10:50:46 -07:00
Claudiu Lodromanean f958dce0b5
Merge pull request #20417 from mikeyarce/rtl-fix-price-filter-widget-label
Fix label for price filter for RTL sites
2018-06-07 10:37:14 -07:00
Claudiu Lodromanean c8480b68f1
Merge pull request #20338 from Spreeuw/patch-5
apply bulk actions oldest to newest
2018-06-07 09:34:38 -07:00
Khan M Rashedun-Naby f617a84b1f PHPDoc @throws Tag Added 2018-06-07 22:02:11 +06:00
Khan M Rashedun-Naby ec76e60e33 PHPDoc Fixed | Used Unused Variable | Else Removed 2018-06-07 21:52:28 +06:00
Khan M Rashedun-Naby c773b9cb4c Made use unused variable and removed else 2018-06-07 21:45:03 +06:00
Khan M Rashedun-Naby 4b14cbc727 Removed unnecessary parameter. Also removed from tests. 2018-06-07 21:25:13 +06:00
Rodrigo Primo cc4871e5ca Only try to upload screenshots if directory is not empty
This commit adds a check before the code that uploads screenshots of failed e2e tests to make it run only if running the Travis build job that executed the tests and if the screenshots/ directory is not empty. There is no need to always download Travis artifacts and try to upload to S3 if there is nothing to upload.
2018-06-07 11:50:36 -03:00
Fulvio Notarstefano e68aa7c027 [#20404] Address code review feedback 2018-06-07 23:33:13 +09:00
Rodrigo Primo ba8e866bf1 Better explain why the screenshots/ directory is excluded from git 2018-06-07 11:32:54 -03:00
Brent Sessions c64a35300a Take screenshots of failed e2e tests (#20313)
This adds screenshots for broken e2e tests. The screenshots will also be uploaded to an Amazon S3 instance from Travis CI so they can be viewed. If run locally, there will be a screenshots directory created where they can be viewed

If there is a failed e2e test you'll see a block under `travis.sh after` in the build log in Travis CI that will give the URLs for the images.

* Adding screenshot capabilities to all tests

* trying screenshots on S3

* try to get a failed test

* finding the right path

* fixing yml

* only taking failed screenshots

* fixing yml

* moving paths to env

* fixing target

* try without artifact target

* fixing test

* setting back temporary changes

* fixing spacing

* unneeded change

* trying different uploader

* Force a failed test

* fixing test again

* fixing  unneeded change

* updating git ignore
2018-06-07 11:31:37 -03:00
Peter Fabian b5c420de99 Fixed milestone according to issue tag. 2018-06-07 15:36:27 +02:00
Peter Fabian 185675c69e Added unit test to cover the orders/refund_id. 2018-06-07 14:58:53 +02:00
Rodrigo Primo fc5aef8478 Add nonce to force update WC database URL
Doing this to check if the user has intention to perform a WC database update before starting the process.
2018-06-07 09:55:47 -03:00
Rodrigo Primo 467bd73ea9 phpcs fixes 2018-06-07 09:45:23 -03:00
Rodrigo Primo a200686005 Add nonce to update WC database URL
Doing this to check if the user has intention to perform a WC database update before starting the process.
2018-06-07 09:45:18 -03:00
Rodrigo Primo 860e3e6d93 phpcs fixes 2018-06-07 08:57:57 -03:00