Commit Graph

22690 Commits

Author SHA1 Message Date
claudiulodro 4c4526424a Remove race condition 2017-07-11 13:21:42 -07:00
claudiulodro 8dd21ec1c4 Resolve merge conflicts 2017-07-11 12:11:01 -07:00
claudiulodro c557a71f14 Better phrasing 2017-07-11 12:04:43 -07:00
claudiulodro 0444cdef3c Initial notice implementation 2017-07-11 11:59:39 -07:00
Caleb Burks 572cf3813f Spacing/typo fix
Should really combine all three of these filters into one as well.
2017-07-11 13:37:43 -05:00
Caleb Burks 03d71cd8ee Add filter for cart cross-sells 2017-07-11 13:33:51 -05:00
Claudio Sanches fd1cb2d67f Merge pull request #16052 from woocommerce/feature/13189-refactored
Add select2 to layered nav
2017-07-11 12:39:33 -03:00
Claudio Sanches 2335b5edf5 Merge pull request #16065 from mjangstadt/patch-1
Explicitly set include path
2017-07-11 12:30:01 -03:00
Mike Jolley ca54ae0068 Merge pull request #16077 from woocommerce/fix/16072-2
[REST API] Check if is a valid instance of WC_Product before load data
2017-07-11 16:29:21 +01:00
Claudio Sanches 4262e83187 [REST API] Check if is a valid instance of WC_Product before load data
Closes #16072
2017-07-11 12:27:56 -03:00
Mike Jolley 651ca35067 Merge pull request #16075 from woocommerce/refactor/remove-legacy-code
Removed PayPal legacy code
2017-07-11 16:17:28 +01:00
Mike Jolley e04ef935a9 Merge branch 'master' into update/15563
# Conflicts:
#	templates/myaccount/my-downloads.php
#	templates/order/order-details.php
2017-07-11 16:13:04 +01:00
Claudio Sanches fa850ecfb4 Removed PayPal legacy code 2017-07-11 12:09:57 -03:00
Mike Jolley b6847ebe60 remove exit 2017-07-11 16:09:31 +01:00
Mike Jolley ce94a1f921 Plain 2017-07-11 16:08:06 +01:00
claudiulodro f79c4a254c Good progress 2017-07-11 07:52:40 -07:00
Claudiu Lodromanean 2f77f31f5e Merge pull request #16068 from woocommerce/fix/16049
Ensure a valid order is found in order-details.php template
2017-07-11 07:48:10 -07:00
Mike Jolley 6462b67307 Merge pull request #16071 from websupporter/fix-typo-in-test
Fix typo in test (Solves #16070)
2017-07-11 14:58:12 +01:00
Mike Jolley 94b32e644a HTML emails 2017-07-11 14:52:30 +01:00
Mike Angstadt 00e8c9a505 removed leading slashes
removed leading slashes
2017-07-11 08:45:06 -05:00
Mike Angstadt 2239ad6dcb updated based on reviewer feedback
Updated based on reviewer feedback.
2017-07-11 08:43:55 -05:00
Mike Jolley 3939f50ced Download display in account/checkout 2017-07-11 13:45:35 +01:00
Websupporter 057c8b3281 Fix typo in test
Just a quick typo fix.
2017-07-11 14:43:54 +03:00
Mike Jolley 70420db6fd Spacing 2017-07-11 11:31:02 +01:00
Mike Jolley ba2063efa4 Merge pull request #15961 from electrokit/order_again_merge_option
Feature: Add option for merging when using 'Order Again'
2017-07-11 11:23:33 +01:00
Mike Jolley fb784930f6 Ensure a valid order is found in order-details.php template
Closes #16049
2017-07-11 11:10:40 +01:00
Mike Jolley bb39053211 Merge pull request #16066 from woocommerce/fix/rest-of-the-world-zone-copy-change
Change the "Rest of the World" zone name to "Locations not covered by your other zones" everywhere
2017-07-11 10:51:44 +01:00
Mike Jolley 5c32abfe6b Merge pull request #16054 from woocommerce/fix/16043
Fix styling and connect button in non-english languages
2017-07-11 10:49:09 +01:00
Mike Jolley be4a3fc99a Typo in set_instance_id() method
Closes #16067
2017-07-11 10:38:50 +01:00
Terence O'Donoghue 8f6dc9588c Fixed reference to deprecated WC_Order properties 2017-07-11 09:57:56 +01:00
Terence O'Donoghue 43eaa8356a Fixed template reference spacing 2017-07-11 09:53:50 +01:00
Terence O'Donoghue c5a75a5442 Use ::get_payment_method_title 2017-07-11 09:51:11 +01:00
Daniel Rey Lopez 04a83b0faa Change the "Rest of the World" zone name to "Locations not covered by your other zones" everywhere 2017-07-11 08:19:42 +01:00
Mike Angstadt fa4e4e40fd Explicitly set include path
If you override include_path and are including this file from outside this directory's context, performance will degrade as both those locations are incorrectly checked first getting an EOF before include() falls back to looking in this directory.

Explicitly setting the include path checks this directory first regardless of calling context location or include_path override so is ideal.
2017-07-10 21:33:42 -05:00
Claudio Sanches e2b81d9116 Merge pull request #16060 from wp-mexico/marcozink-i18n/states/MX-HTML-characters
Update MX.php
2017-07-10 20:52:14 -03:00
Marco Zink dce55fcc86 Update MX.php
Fix extra space
2017-07-10 17:41:06 -05:00
Claudio Sanches 86038e8c41 Merge pull request #16058 from woocommerce/update/selectwoo
Make multiselects accessible in selectWoo
2017-07-10 19:24:54 -03:00
Marco Zink d066a05410 Update MX.php
Accented characters are now using the correct HTML code `acute`, users were experiencing problems in order acceptance when using a state with a special character.
2017-07-10 15:45:17 -05:00
claudiulodro f2167e92d4 Latest selectWoo 2017-07-10 13:28:49 -07:00
Claudiu Lodromanean 1699a9769f Merge pull request #16020 from woocommerce/feature/12273
New attribute helper functions
2017-07-10 13:20:59 -07:00
Claudio Sanches a7582d50da Merge pull request #16050 from woocommerce/update/15985
Use select2 in cart
2017-07-10 15:40:56 -03:00
Claudio Sanches 1c18a458be Merge pull request #15994 from woocommerce/fix/15964
Correct embed code
2017-07-10 15:30:25 -03:00
Claudio Sanches 37a3eb9078 Merge pull request #16056 from woocommerce/fix/16028
Allow times in importer date fields
2017-07-10 14:21:43 -03:00
claudiulodro 03403b2c44 Allow times in date fields 2017-07-10 09:19:59 -07:00
Claudiu Lodromanean d850ca235a Merge pull request #16044 from woocommerce/fix/16027
Pass correct value to woocommerce_shipping_classes_save_class when inserting a new term
2017-07-10 08:32:15 -07:00
Mike Jolley e432d2d0ad Fix styling and connect button in non-english languages 2017-07-10 16:29:06 +01:00
Mike Jolley 872dca636f Feedback 2017-07-10 14:48:42 +01:00
Mike Jolley a6967d69d4 Normalise state keys 2017-07-10 14:48:42 +01:00
Mike Jolley a527a9566b Add select2 to layered nav 2017-07-10 14:36:47 +01:00
Mike Jolley 0a3856c5cb Merge branch 'master' into feature-13189 2017-07-10 13:24:42 +01:00