Commit Graph

21682 Commits

Author SHA1 Message Date
Mike Jolley 1fb81fa450 Create CODE_OF_CONDUCT.md 2017-06-15 12:13:17 +01:00
Claudio Sanches a74daaa9cf Master is 3.2.0-dev now 2017-06-14 16:09:00 -03:00
Claudio Sanches 594aa66f4e 3.1.0-rc.1 2017-06-14 16:07:22 -03:00
Claudio Sanches e0bbe4388d Merge pull request #15619 from woocommerce/fix/update-test
Update test and add flag to importer
2017-06-14 16:03:27 -03:00
claudiulodro 1d3c4ebb4d Add flag for timeout checking 2017-06-14 11:35:22 -07:00
claudiulodro 86c43459fc Update test 2017-06-14 11:08:39 -07:00
Claudiu Lodromanean b9842b6f21 Merge pull request #15615 from woocommerce/update/15576
Prevent memory and time limits in importer
2017-06-14 10:20:29 -07:00
Mike Jolley 4dea3ece8a Fix memory limit detection on some systems 2017-06-14 18:16:39 +01:00
Claudio Sanches 4b0775151a Merge pull request #15603 from woocommerce/fix/15574
Restored emails settings default values
2017-06-14 14:05:52 -03:00
Claudio Sanches e9b64aec7b Merge branch 'master' into fix/15574 2017-06-14 14:05:01 -03:00
Claudio Sanches 7a4b68f551 It's clear that is a subject for an email 2017-06-14 14:01:12 -03:00
Claudiu Lodromanean 7dd1cdca0a Merge pull request #15618 from woocommerce/fix/15614
Importer; create placeholders when importing products with IDs
2017-06-14 09:59:13 -07:00
Mike Jolley 9f5ff05269 Re-run grunt tasks 2017-06-14 17:58:42 +01:00
claudiulodro 57c5bab731 Space 2017-06-14 09:58:15 -07:00
Mike Jolley 8e7e8c269f Raise input padding so placeholder is not so squished 2017-06-14 17:56:18 +01:00
Mike Jolley c3ee9a77f5 Tweak tips and placeholders for all emails 2017-06-14 17:50:17 +01:00
Claudio Sanches e3b7e4e566 Use placeholders and description to inform the default values 2017-06-14 13:13:43 -03:00
Mike Jolley 0de65b3a8d Start time 2017-06-14 17:04:47 +01:00
Claudiu Lodromanean 4f5f04ec79 Merge pull request #15611 from woocommerce/fix/15606
More strict COD method matching
2017-06-14 09:04:46 -07:00
Claudiu Lodromanean bdb7194b2e Merge pull request #15612 from woocommerce/fix/15592
Recalculate totals after local pickup selection
2017-06-14 08:55:50 -07:00
Mike Jolley 8bd7f89f73 Clear placeholder data after import 2017-06-14 16:38:07 +01:00
Mike Jolley 907b986d4f Tweak wording 2017-06-14 16:37:53 +01:00
Mike Jolley cb34cb8d81 Made variations more lenient so that they can be created whilst a parent does not yet exist 2017-06-14 16:37:46 +01:00
Mike Jolley fdc6c46e80 Clear slug for placeholder products 2017-06-14 16:37:21 +01:00
Mike Jolley 8603e75b5e Create placeholders when importing products with an ID column and not updating 2017-06-14 16:37:07 +01:00
Konstantin Kovshenin 247e13e2ca Helper: Various Improvements (#15519)
* Helper: Improve messaging and CTAs

* Helper: Update copy on connect flow

* Helper: Improve messaging around plugins without a subscription

* removes toggle from extensions that cannot be activated

* Helper: Add new `WC_Helper_Compat` class for legacy helper compat

This new class removes some of the actions from the legacy helper
(updater) plugin, attempts to migrate an existing legacy connection
to a new one, attempts to deactivate the old helper plugin.

* Helper: Improve messaging around maxed out subscriptions

* Helper: Enable `WC_Tracker` when connected to WooCommerce.com

* Helper: adds styles for manual licence form row and other visual improvements

* Helper: removes disabled toggles

* Helper: adds styles for connection component

* Helper: redesigned connection module

* Helper: rotates the connection module chevron on mouse hover

* Helper: adds some fixes to the key form on mobile and other updates to meet coding standards

* Helper: Only mark action as primary if there's a CTA button.

* Helper: Better handling for woothemes_updater_notice

Remove the updater notice built into extensions and themes, even
if the legacy Helper plugin is deactivated.

* Helper: Navigate existing Helper users to the new place.

Adds a Dashboard menu item and direct users of the old helper
plugin to the new Extensions screen.

* Helper: Do not show the back-compat menu item for new users

* Helper: Avoid notice in API authentication if credentials are missing

* Helper: Hide the back-compat menu item when users see the new screen

Also sets the user_id for the connection if one was not previously set.
2017-06-14 14:12:53 +01:00
Mike Jolley 77cee56ae8 Prevent memory and time limits 2017-06-14 14:02:47 +01:00
Mike Jolley 9fb8fa4761 Merge pull request #15610 from woocommerce/update/15604
Copy tweaks for catalog visibility
2017-06-14 13:08:36 +01:00
Mike Jolley 3132d641e3 Merge pull request #15600 from woocommerce/improvement/15596
Add checks in get_orders_generate_customer_meta_query
2017-06-14 13:04:03 +01:00
Mike Jolley 66c7c20844 Should work in reverse 2017-06-14 12:57:26 +01:00
Mike Jolley 985f7e043f Update totals if local pickup is selected 2017-06-14 12:46:59 +01:00
Mike Jolley 55e9add8e5 More strict COD method matching
Fixes #15606
2017-06-14 12:17:28 +01:00
Mike Jolley 4a4e201888 Copy tweaks for catalog visibility
Ref #15604
2017-06-14 12:07:20 +01:00
Valerie K 66259ebff1 Update WooCommerce Services copy (#15598)
* Remove excess explanation from wizard shipping step

* Remove distracting link from shipping wizard page

* Update copy on extensions WCS banner

* Update copy on WCS extensions banner for Canada

* Fix extensions WCS banner when read from json

* Add Canada copy on wizard shipping step

* Use strict array comparison in WCS shipping tout

* Add service logos to WCS extension banner

* Use strict array comparison in WCS banner

* Remove related extensions when showing WCS banner

- when store is based in Canada remove Canada Post
extension from shipping page
- when store is based in US remove USPS
extension from shipping page

* Add image alt for logos on WCS banners

* Update WCS banner and wizard content
2017-06-14 11:24:45 +01:00
Claudio Sanches 62c65e778b Restored emails settings default values
Closes #15574
2017-06-13 20:00:50 -03:00
claudiulodro 62064d56f8 Add edge case test 2017-06-13 14:00:12 -07:00
claudiulodro 489e67dbe1 Remove unnecessary checks 2017-06-13 13:37:40 -07:00
claudiulodro f1a9dbc69e Extra checks and tests 2017-06-13 13:32:21 -07:00
Claudio Sanches 6d1c133a3e Merge pull request #15594 from woocommerce/fix/15561
Remove escape to fix saving of Special characters in attributes
2017-06-13 14:28:39 -03:00
Mike Jolley ba2bf67bb9 Use hash_equals where needed 2017-06-13 13:54:02 +01:00
Mike Jolley e24ca9d3bc Merge remote-tracking branch 'origin/master' 2017-06-13 13:35:17 +01:00
Mike Jolley eba3241d6a Merge branch 'pr/15591' 2017-06-13 13:35:11 +01:00
Mike Jolley 598982ef70 Standards 2017-06-13 13:34:46 +01:00
Mike Jolley c4c3d37101 Remove escape 2017-06-13 13:30:00 +01:00
Mike Jolley 393f1be092 Merge pull request #15580 from woocommerce/refactore/improve-importer-mapping-options
Better importer mapping options
2017-06-13 12:15:33 +01:00
Mike Jolley 1a6e477c83 Merge pull request #15579 from woocommerce/fix/importer-delimiter
Start handle importer delimiter
2017-06-13 11:57:10 +01:00
Mike Jolley 3d50d1468c Merge pull request #15590 from woocommerce/fix/15584
Prevent error in wc_get_product_term_ids
2017-06-13 11:43:00 +01:00
Mike Jolley 282bf0fd68 Cleanup 2017-06-13 11:41:44 +01:00
nishitlangaliya efea26d8fa Fixed Login Issue when the username is an email ref #15577 2017-06-13 16:09:54 +05:30
Mike Jolley 5b1af1b75f Merge pull request #15550 from ughimire/product-import
Fixed - Directory separator issue on windows for product import file …
2017-06-13 11:35:40 +01:00