Commit Graph

31255 Commits

Author SHA1 Message Date
Timmy Crawford 800ad318e3 OBW: Ensure tracker opt-in is always shown. 2019-03-27 15:29:55 -07:00
Timmy Crawford 4cad501098
Merge pull request #23146 from woocommerce/fix/22695
Update fallback download URL in helper
2019-03-27 15:01:10 -07:00
Timmy Crawford 0b113621a6
Merge pull request #23145 from woocommerce/fix/23107
Introduce `wc_create_new_customer_username` function
2019-03-27 14:59:24 -07:00
Timmy Crawford b5da160e9d
Merge pull request #23128 from woocommerce/fix/23078
Change default completed email wording
2019-03-27 13:19:54 -07:00
Timmy Crawford 9601bc64d1
Merge pull request #23138 from woocommerce/fix/23103
REST API: Adds future status to list of allowed statuses
2019-03-27 13:19:32 -07:00
Timmy Crawford 91d412f150
Merge pull request #23149 from woocommerce/update/23144
Update refund reason to make it clear refunding is manual
2019-03-27 13:18:53 -07:00
Timmy Crawford 7e17cbfb85
Merge pull request #23158 from woocommerce/fix/jshint-marketplace
Fixed JSHint warnings on marketplace suggestions script
2019-03-27 13:18:33 -07:00
Timmy Crawford eb106853c5
Merge pull request #23156 from woocommerce/fix/23121
5.2 fix from ActionScheduler
2019-03-27 13:18:14 -07:00
Rodrigo Primo cbf6149cb9
Merge pull request #23069 from woocommerce/fix/23061
Variation stock status field handling (displaying/hiding when needed)
2019-03-27 14:51:26 -03:00
Rodrigo Primo 5d8ca32789
Merge pull request #23131 from woocommerce/fix/23118
`WC_Ajax::add_variation` force variable product type
2019-03-27 14:20:35 -03:00
Claudio Sanches 08bb78a817 Fixed JSHint warnings on marketplace suggestions script
Fixes the follow error:

```
assets/js/admin/marketplace-suggestions.js
278 | return ! _.contains( marketplace_suggestions.active_plugins, promo['product'] );
^ ['product'] is better written in dot notation.
```
2019-03-27 13:21:54 -03:00
Mike Jolley 4d5cda49c2 Hotfix for AS
Pulls in the fix from https://github.com/Prospress/action-scheduler/pull/268
2019-03-27 14:45:36 +00:00
Timmy Crawford 5a33e13432
Merge pull request #23151 from woocommerce/fix/emogrifier-conflict
Update Emogrifier class and usage
2019-03-27 07:27:14 -07:00
Mike Jolley ad49085571 Append random number to reduce recusion 2019-03-27 12:22:15 +00:00
Mike Jolley aa301bda4c
Merge pull request #23106 from rodrigoprimo/travis-chromedriver
Only install Chrome and Nginx in the build job that uses it
2019-03-27 11:54:59 +00:00
Mike Jolley ded4f8bf3e Use string to avoid 5.2 warning 2019-03-27 11:35:45 +00:00
Timmy Crawford 8b24528b16
Merge pull request #23102 from woocommerce/update/prevent-fatal-errors-when-extending-rest-api
If someone tries to load WC_REST class to early, throw notice
2019-03-26 17:19:06 -07:00
Ben S c1a6cdb873
Format empty cart message as information notice 2019-03-26 18:35:21 +01:00
Rodrigo Primo 402179a321
Merge pull request #23136 from woocommerce/fix/23117
Lookup table SQL: Avoid orderby during updates
2019-03-26 11:59:36 -03:00
Mike Jolley ea19f732fd min/max functions instead of orderby 2019-03-26 14:41:27 +00:00
Mike Jolley b09a5f8003 Update Emogrifier 2019-03-26 14:24:21 +00:00
Mike Jolley 5901c8ed6c Merge branch 'update/prevent-fatal-errors-when-extending-rest-api' of https://github.com/woocommerce/woocommerce into update/prevent-fatal-errors-when-extending-rest-api 2019-03-26 14:06:27 +00:00
Mike Jolley c79e3ad8f1 Detect all rest endpoints, not just wc/ 2019-03-26 14:06:22 +00:00
Mike Jolley bdc009cfbf Update refund reason to make it clear refunding is manual 2019-03-26 12:46:27 +00:00
Mike Jolley 3a8c3b3813 Update download URL in helper 2019-03-26 11:36:41 +00:00
Mike Jolley 2b8f8e38d1 wc_create_new_customer_username function 2019-03-26 11:09:37 +00:00
Mike Jolley 94466460ad Tests 2019-03-26 11:09:30 +00:00
Timmy Crawford 0e19ca304d
Merge pull request #23110 from woocommerce/fix/improve-suggestions-tracks-attributes
send additional properties with Marketplace Suggestions tracks events
2019-03-25 19:52:55 -07:00
haszari 6294dd14e2 send empty string instead of "undefined" for optional suggestions props 2019-03-26 09:59:28 +13:00
Mike Jolley 8aeff9bb2f Adds future status to list of allowed statuses 2019-03-25 15:19:48 +00:00
Mike Jolley 58651e8a2a When moving data for lookup tables, avoid orderby 2019-03-25 14:23:36 +00:00
Mike Jolley 174ca94b79 WC_Ajax::add_variation - force variable product type 2019-03-25 11:56:48 +00:00
Mike Jolley 1b1040b91a Update screenshots and optimise file sizes
Closes #23056
2019-03-25 11:16:55 +00:00
Mike Jolley 0a44c124be Change completed email wording to "We have finished processing your order" 2019-03-25 10:53:57 +00:00
Mike Jolley cba936997f
Merge pull request #23119 from woocommerce/renovate/grunt-1.x
Update dependency grunt to v1.0.4
2019-03-25 09:57:46 +00:00
Francesco Pinto 69d4d9b221
Fixed Coding Standard 2019-03-23 20:58:36 +01:00
Francesco Pinto d1df273f9e
Fixed Coding Standards 2019-03-23 20:28:58 +01:00
Francesco Pinto c2bd9bcdf5
Add taxonomy-specific classes to active filters 2019-03-23 18:03:01 +01:00
Timmy Crawford 288460ff63
Merge pull request #23080 from woocommerce/fix/woo-blocks-stable-error
Blocks: Prevent duplicate class loading for blocks feature plugin
2019-03-22 13:48:46 -07:00
Renovate Bot c0d7a98f5b
Update dependency grunt to v1.0.4 2019-03-22 18:53:08 +00:00
Kelly Dwan b5c48993c8 Use the released RC2 version 2019-03-22 10:58:02 -04:00
Kelly Dwan 8c109f7925 Shortcut out if we see the feature plugin, v1.4 or below 2019-03-22 10:48:06 -04:00
Mike Jolley e42d40d702
Merge pull request #23105 from woocommerce/renovate/grunt-contrib-uglify-4.x
Update dependency grunt-contrib-uglify to v4.0.1
2019-03-22 10:08:44 +00:00
haszari cc78cf040f send additional properties with suggestions tracks events:
- send the context/area
- details about what's promoted (product or otherwise)
- target url
2019-03-22 15:42:30 +13:00
Renovate Bot d65355a115
Update dependency grunt-contrib-uglify to v4.0.1 2019-03-21 18:57:42 +00:00
Rodrigo Primo 6001b0177e Only install Chrome and Nginx in the build job that uses it
This commit changes Travis configuration to only install Chrome and Nginx in the e2e tests build job, which is the only one that requires those packages. This change should save a little bit of time in the Travis build as before Travis was installing Chrome and Nginx in all the jobs.
2019-03-21 15:44:02 -03:00
Rodrigo Primo d2c294af95 Merge branch 'master' into update/prevent-fatal-errors-when-extending-rest-api 2019-03-21 15:31:29 -03:00
Rodrigo Primo b3fdbe1891 Merge branch 'master' into update/23090 2019-03-21 15:30:40 -03:00
Rodrigo Primo 38437e8f50
Merge pull request #23104 from rodrigoprimo/fix/phpcs-in-travis
Fix PHPCS in the Travis builds
2019-03-21 15:29:22 -03:00
Rodrigo Primo 61a096d871 Fix PHPCS in the Travis builds
PR https://github.com/woocommerce/woocommerce/pull/23082 made some changes to the Travis configuration and one of those changes broke the PHPCS when running inside Travis with the following error:

```
ERROR: Referenced sniff "WooCommerce-Core" does not exist
```

For example: https://travis-ci.org/woocommerce/woocommerce/jobs/509471213#L659

This problem went unnoticed during the PR review as no PHP file was modified in it and thus there was no file for PHPCS to check.

This commit fixes the error above by installing the Composer package `woocommerce/woocommerce-sniffs` which is the package that provides `WooCommerce-Core` sniffs and which installs `wp-coding-standards/wpcs` as one of its requirements. I couldn't find an easy way to make this work installing `woocommerce/woocommerce-sniffs` globally so that is why this commit also removes the `global` parameter when calling composer.
2019-03-21 15:23:42 -03:00