Commit Graph

21847 Commits

Author SHA1 Message Date
Mike Jolley 31ea63d0c9 Merge pull request #15787 from shivapoudel/grunt-sass
Use of grunt-sass for node sass
2017-06-28 16:47:14 +01:00
Mike Jolley 67b8779861 Merge pull request #15850 from woocommerce/fix/15848
Dont set everything up if 'woocommerce_admin' doesn't exist
2017-06-28 16:41:21 +01:00
claudiulodro 09c9c6e359 Dont set everything up if key variable doesnt exist 2017-06-28 08:31:55 -07:00
Claudio Sanches 6228e356b1 Merge pull request #15842 from woocommerce/fix/15840
Skip non existing rows on merge
2017-06-28 11:19:21 -03:00
Claudio Sanches 41cd12c123 Merge pull request #15844 from woocommerce/update/15839
Update MX states and MX state data
2017-06-28 11:14:48 -03:00
Claudio Sanches 70ae880f29 Merge pull request #15843 from woocommerce/fix/15834
Force date created on update if not set.
2017-06-28 11:11:40 -03:00
Mike Jolley f6eec3fd17 3.2 readme in master 2017-06-28 13:33:18 +01:00
Mike Jolley 429e4bfed1 Merge pull request #15837 from thenbrent/revert_pr_14706
Revert pull request #14706 with changes to Abstract_WC_Order::get_item() to avoid critical fatal errors
2017-06-28 13:31:57 +01:00
Mike Jolley b83f3cb9af handle MX state updates 2017-06-28 12:57:37 +01:00
Mike Jolley 49f2dae450 Merge pull request #15823 from ChaseWiseman/fix-checkout-shipping-calculator
Don't output the shipping calculator markup on the Checkout page
2017-06-28 12:30:47 +01:00
Mike Jolley 8dcbf9aa8d Force date created on update if not set.
Closes #15834
2017-06-28 12:25:23 +01:00
Mike Jolley e937047d04 Skip non existing rows on merge 2017-06-28 12:06:33 +01:00
Mike Jolley f16c2f73f4 Merge pull request #15833 from woocommerce/template-comments-update
Update some template comments
2017-06-28 10:34:26 +01:00
dabodude 00fba29c6e Update MX.PHP
Renamed Distrito Federal to Ciudad de Mexico which is the new official name of the "Capital State"
Changed States to a 3 letter ISO 3166:2 Code https://es.wikipedia.org/wiki/ISO_3166-2:MX
2017-06-28 01:04:34 -05:00
Brent Shepherd 1992d90d37 Revert "Merge pull request #14706 from crodas/make_get_item_consistent"
This reverts commit 56ffa3d2aa, reversing
changes made to 64a60de24f.
2017-06-27 22:28:23 -07:00
Claudio Sanches ebbdc16684 Merge pull request #15830 from woocommerce/fix/sniff
Fix codesniffer violations
2017-06-28 01:37:40 -03:00
Caleb Burks 9d68638f48 Update some template comments 2017-06-27 23:04:09 -05:00
claudiulodro 506c01f56a Fix codesniffer violations 2017-06-27 14:19:59 -07:00
Claudio Sanches c7f47e9393 Merge pull request #15826 from woocommerce/refactore/duplicated-canada-post-string
Remove Canada Post duplicated description
2017-06-27 17:13:07 -03:00
Claudio Sanches b9c76c568b Prefer "live rates form" 2017-06-27 17:00:48 -03:00
Claudio Sanches a0425ad1b9 Remove Canada Post duplicated description
Duplicated with description from
includes/admin/class-wc-admin-setup-wizard.php:506
2017-06-27 16:57:46 -03:00
Chase Wiseman f8a040ad04 Only output the shipping calculator markup on the cart page 2017-06-27 11:37:55 -07:00
Claudiu Lodromanean c3d09543a8 Merge pull request #15821 from woocommerce/fix/15789
Redirect ?customer-logout=true to the correct endpoint
2017-06-27 10:28:33 -07:00
Claudio Sanches 5bc03b41cf Redirect ?customer-logout=true to the correct endpoint
Checking also for `'true' === $wp->query_vars['customer-logout']` to avoid infite loops when permalinks are deactivated and "My account" is the front page.

Closes #15789
2017-06-27 14:10:20 -03:00
Claudio Sanches be0fc10bfe Merge pull request #15817 from woocommerce/fix/15795
Only set default if no value is set in API settings
2017-06-27 13:05:58 -03:00
Claudio Sanches fe542d4d4e Merge pull request #15816 from woocommerce/fix/15808
Add slashes to meta value in data store before passing to WP functions
2017-06-27 13:03:13 -03:00
Claudio Sanches fbd92c8105 Merge pull request #15815 from woocommerce/fix/15794
Prevent duplicate sections in tax and api endpoints
2017-06-27 13:01:05 -03:00
Claudiu Lodromanean 5bbe82571f Merge pull request #15814 from woocommerce/fix/15804
Fix notice and missing terms in importer
2017-06-27 08:45:52 -07:00
Mike Jolley 7f9ebf8e72 update changelog 2017-06-27 15:39:44 +01:00
Mike Jolley afcfb4eb35 Only set default if no value is set in API settings 2017-06-27 15:29:31 +01:00
Mike Jolley f6240a1626 Merge pull request #15811 from danielhuesken/fix_importer_filtype
Importer fix file type detection on local path
2017-06-27 15:24:36 +01:00
Mike Jolley d568069c37 Add slashes to meta value in data store before passing to WP functions
Fixes #15808
2017-06-27 15:11:32 +01:00
Mike Jolley 33a4e74697 Prevent duplicate sections in tax and api endpoints 2017-06-27 14:58:33 +01:00
Mike Jolley 26b98bc3df Fix notice and return correct attribute ID 2017-06-27 14:39:30 +01:00
Mike Jolley 591cac37d1 Increased batch size 2017-06-27 14:39:18 +01:00
Daniel Hüsken d6377c9609 will improve #15806 2017-06-27 14:43:51 +02:00
Daniel Hüsken 84881c3e36 Importer fix file type detection on local path 2017-06-27 14:21:05 +02:00
Claudio Sanches d04e439132 Merge pull request #15796 from franticpsyx/dry-importer-extend
[3.1-RC.2] Allow DRY product importer integration
2017-06-27 00:19:28 -03:00
Manos Psychogyiopoulos c8e166f706 Add woocommerce_product_importer_formatting_callbacks filter 2017-06-27 01:49:18 +03:00
Manos Psychogyiopoulos 7778bf894e Allow DRY product importer integration 2017-06-26 23:49:48 +03:00
Claudiu Lodromanean a05252753f Merge pull request #15790 from woocommerce/fix/15781-2
Remove BOM signature from imported results
2017-06-26 12:49:59 -07:00
Claudio Sanches ec1500d1b7 Remove BOM signature from imported results
Fix missing mapping for ID column
2017-06-26 16:08:05 -03:00
Claudio Sanches ab9c331a8d Merge pull request #15785 from woocommerce/fix/15781
Importer tweaks and fixes
2017-06-26 16:07:19 -03:00
Mike Jolley afd43b3b78 Look for mapped ID when parsing ID field 2017-06-26 18:41:51 +01:00
Shiva Poudel 9c926b481a Use of grunt-sass for node sass 2017-06-26 23:01:46 +05:45
Claudio Sanches 1fb11d0be7 Merge pull request #15783 from woocommerce/fix/15770
After duplicating variations, ensure the duplicated object is current
2017-06-26 13:41:17 -03:00
Mike Jolley 496b741d1c Create placeholder when mapping relative ids 2017-06-26 17:40:20 +01:00
Claudio Sanches cb0abd5483 Merge pull request #15784 from woocommerce/fix/15769
get_catalog_ordering_args should cast orderby to string
2017-06-26 13:29:07 -03:00
Mike Jolley 04a27389ef Clean up failed imports 2017-06-26 14:11:27 +01:00
Mike Jolley a907fd8627 get_catalog_ordering_args should cast orderby to string
Fixes #15769
2017-06-26 13:38:57 +01:00