Commit Graph

25045 Commits

Author SHA1 Message Date
Mike Jolley ef4c05a393 Merge branch 'pr/17098' 2017-11-01 12:43:35 +00:00
Mike Jolley 415d1ab061 Use global if it exists to improve performance. 2017-11-01 12:43:26 +00:00
Mike Jolley ff02941a53 Merge branch 'pr/17434' 2017-11-01 12:32:52 +00:00
Mike Jolley 80dfbc0ced phpcs tweaks and escaping 2017-11-01 12:32:35 +00:00
Mike Jolley c17e76adc8
Merge pull request #17113 from woocommerce/add/travis-phpcs
Run PHPCS in Travis CI
2017-11-01 12:18:44 +00:00
Mike Jolley 6285c79e33 Merge branch 'pr/16550' 2017-11-01 12:10:48 +00:00
Mike Jolley 1da13769c8 Merge branch 'master' into pr/16550
# Conflicts:
#	assets/js/frontend/checkout.min.js
2017-11-01 12:10:39 +00:00
Mike Jolley 026ca73e38
Merge pull request #17482 from woocommerce/fix/17422
Update e2e tests and add e2e DB
2017-11-01 12:01:46 +00:00
Mike Jolley f0e87f1fce
Merge pull request #17481 from woocommerce/fix/a
Start scripts once document is ready
2017-11-01 11:52:44 +00:00
Mike Jolley 5d500ba5fb wc_caught_exception method 2017-11-01 11:41:53 +00:00
Mike Jolley 90f3a46073
Merge pull request #17486 from veisis/patch-1
Class name fix in docblock
2017-11-01 11:06:04 +00:00
veisis fbd1b114db
Class name fix in docblock 2017-11-01 11:59:49 +02:00
claudiulodro 64a4a00198 Add e2e db 2017-10-31 13:50:39 -07:00
claudiulodro d72b29d4b7 Couple tweaks to make test run well on latest WC 2017-10-31 13:36:01 -07:00
Claudiu Lodromanean 06f8e85033
Merge pull request #17480 from woocommerce/grunt-e2e-tests-grep
Add new grunt task to run only a selection of e2e tests
2017-10-31 13:12:46 -07:00
claudiulodro afa0ca23d2 Start scripts once document is ready 2017-10-31 12:27:57 -07:00
claudiulodro 88eb283713 Update e2e tests 2017-10-31 11:14:19 -07:00
Rodrigo Primo 18afd7866f Add new grunt task to run only a selection of e2e tests
Example:

`node_modules/grunt/bin/grunt e2e-tests-grep --grep='should be able to add simple products to the cart'`

Mocha will run only tests that matches the pattern passed to `--grep`
2017-10-31 15:53:51 -02:00
Claudio Sanches 77d4d9a37c
Merge pull request #17476 from woocommerce/pr/17111
Grouped products; allow custom columns and changes to values
2017-10-31 14:12:52 -02:00
Mike Jolley ecb90b4ae5 Merge branch 'master' into pr/17111
# Conflicts:
#	templates/single-product/add-to-cart/grouped.php
2017-10-31 16:08:32 +00:00
Mike Jolley b8e0016dcd Grouped products; allow custom columns and changes to values 2017-10-31 16:07:30 +00:00
Claudio Sanches e1a4f6e159
Merge pull request #17470 from woocommerce/pr/16959
Added actions before calculations order totals and taxes and is_vat_excempt support
2017-10-31 12:21:08 -02:00
Claudio Sanches 418bbbfee5
Merge pull request #17467 from woocommerce/fix/17460-currency
Add direction character to currency output
2017-10-31 12:04:37 -02:00
Claudio Sanches 42ae05265b
Merge pull request #16725 from woocommerce/update/14260
Shortcode random sorting
2017-10-31 11:56:19 -02:00
Mike Jolley 95cad5fae0 Added unit test 2017-10-31 13:51:06 +00:00
Mike Jolley 7c74e77849 handle tax removal in order class 2017-10-31 13:37:57 +00:00
Mike Jolley 80b16adb0a Revert is_vat_exempt changes in item classes 2017-10-31 13:36:57 +00:00
Mike Jolley bc7484f473 Merge branch 'master' into pr/16959
# Conflicts:
#	includes/abstracts/abstract-wc-order.php
2017-10-31 13:33:09 +00:00
Claudio Sanches dfc8c20bb1 Updated CHANGELOG.txt 2017-10-31 11:20:02 -02:00
Mike Jolley 01730cdc4f Add method to generate transient name 2017-10-31 12:58:36 +00:00
Mike Jolley 5848590333 Merge branch 'master' into update/14260 2017-10-31 12:54:35 +00:00
Mike Jolley beecba5468 Update tests against formats 2017-10-31 12:36:54 +00:00
Mike Jolley cb087a0755 fix tests and minify css 2017-10-31 12:26:59 +00:00
Mike Jolley 43ba326ed9 Fix currency position with rtl symbols 2017-10-31 12:22:18 +00:00
Gabor Javorszky d530556a0f Add short circuit to customer bought product function 2017-10-30 17:20:55 +00:00
Mike Jolley 17a6f9fb15
Merge pull request #17421 from woocommerce/fix/method-return-value-in-write-content
Fixed method returning value in write content warning in legacy PHP
2017-10-30 14:17:37 +00:00
Claudio Sanches 83057e3771
Merge pull request #17455 from woocommerce/pr/17450
Use item tax class rather than product tax class for getter
2017-10-30 12:13:58 -02:00
Mike Jolley 9521a0ba1f Improve tax class check and handle non-taxable items 2017-10-30 13:23:15 +00:00
Claudio Sanches 3b43657932
Merge pull request #17428 from woocommerce/fix/17424
Fix order methods and add tests
2017-10-30 11:01:37 -02:00
Claudio Sanches 777ba46299
Merge branch 'master' into fix/17424 2017-10-30 11:01:17 -02:00
Mike Jolley cb998799c6
Merge pull request #17298 from dechov/update/ignore-existing-unit-option-values-in-wizard
Ignore existing unit option values in wizard in favor of national unit conventions
2017-10-30 12:55:06 +00:00
Mike Jolley 09a1bf5f06
Merge pull request #17425 from woocommerce/fix/17406
selectWoo useability improvements
2017-10-30 12:48:39 +00:00
Mike Jolley 7ec2c5a736
Merge pull request #17444 from shivapoudel/fix/empty-content
Fix - Undefined variable: empty_content in order screen
2017-10-30 12:25:52 +00:00
Mike Jolley b436ad34e6 Merge branch 'pr/17452' 2017-10-30 12:15:41 +00:00
Mike Jolley c1d86b9994 Split up skip logic 2017-10-30 12:15:32 +00:00
Claudio Sanches 4b13b6e79c
Merge pull request #17409 from woocommerce/tweak/invoice-email-name
Change title of Customer invoice email
2017-10-30 10:09:33 -02:00
Mike Jolley 19942dadf0
Merge pull request #17445 from woocommerce/update/stripe-logo
Use blue Stripe logo in Wizard
2017-10-30 11:30:49 +00:00
Diego Zanella 3576025036 Added filter to process meta to be exported 2017-10-30 10:19:57 +00:00
Ewout Fernhout 029e93fd4f
Use item tax class rather than product tax class for getter
Fixes #17449
2017-10-30 11:04:56 +01:00
roykho 758b86d8ed Use blue Stripe logo in Wizard 2017-10-29 20:01:27 -04:00