5131d096a8
JSMIN
2017-09-20 16:03:30 +01:00
eb3396328b
Apply default locale before country locale
2017-09-20 16:03:26 +01:00
d125739742
fix init
2017-09-16 12:37:29 -07:00
7cc931c185
Init price slider after using customizer
...
Closes #16834
2017-09-16 12:16:43 -07:00
794aaefb04
Increase delay for json_search_customers
...
Increases the delay for `woocommerce_json_search_customers` to 1000, to prevent a lot of unneeded queries from happening.
Fixes #16805 .
2017-09-14 10:30:50 +02:00
213bfabb24
Merge pull request #16763 from woocommerce/fix/16757
...
Update shipping code to see if full address has been entered before showing no shipping notice
2017-09-08 09:43:23 -07:00
b2a9b310fe
Only trim multiselect buttons
2017-09-08 09:21:28 -07:00
a7b2ae8661
Update shipping code to see if full address has been entered before showing no shipping notice
...
Fixes #16757
2017-09-08 14:54:15 +01:00
c0f5fbd5fc
Leave width for nested inputs
2017-09-08 12:27:16 +01:00
8d90c12473
Make changes in selectWoo repo and bring in minified files
2017-09-07 10:58:08 -07:00
6bd3892a5b
Make selectwoo trim text to avoid whitespace
2017-09-07 12:13:11 +01:00
a3c876a2ef
Extra i18n address handling for cart page compatibility
2017-09-06 12:42:12 -07:00
4d1f636bc3
Merge pull request #16716 from woocommerce/fix/helper-mobile-filter
...
Helper: fix counter indicator in subscriptions filter
2017-09-06 10:47:05 +01:00
eec2bb1a1a
Helper: fix counter indicator in subscriptions filter
2017-09-05 17:33:10 +01:00
9bed39018d
Fix CSS changes
2017-09-05 17:30:43 +05:30
16dd43c9dc
Blockui
2017-09-04 18:11:51 +01:00
1fb572f9ee
Remove columns
2017-09-04 18:05:34 +01:00
2a71a66fc9
Order screen refinements and preview window
2017-09-04 17:42:31 +01:00
5475ae6e2b
Avoid full refresh if user cancels a bulk action
...
Fixes #16658
2017-08-31 12:01:25 +01:00
ffd3c5f406
Min
2017-08-30 21:23:26 +01:00
d58a09e76a
Merge branch 'master' into helper-updates
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
2017-08-30 21:22:48 +01:00
b898cd5a98
Correct CSS to show notifcation count
2017-08-30 15:26:46 -04:00
fce69c3dad
Fix status page padding
2017-08-30 15:39:54 +01:00
ac225ee070
Delay variation transition to allow gallery to load
...
Fixes #16647
2017-08-30 12:48:02 +01:00
968ed17627
Touchscreen handling in selectwoo
2017-08-29 11:54:40 -07:00
bb7691255d
Helper: adds styles for update counter
2017-08-29 10:53:48 +01:00
0585df9fe3
Helper: additional styles for subscription filter
2017-08-29 10:11:47 +01:00
e0b4d59bb6
Merge pull request #16566 from franticpsyx/reload-order-items-on-add
...
Reload items table after adding line item manually
2017-08-29 10:08:29 +01:00
d5abf42081
Merge pull request #16599 from woocommerce/fix/selectwoo
...
selectWoo beta 2
2017-08-28 16:39:32 -03:00
2a97509a3e
Fixed js param name
...
Fixes #16627
2017-08-28 16:36:02 +02:00
0db59927d9
Fix input focus bug
2017-08-25 09:41:02 -07:00
e71553ed33
selectWoo beta 2
2017-08-24 15:03:26 -07:00
372723dae1
min
2017-08-23 11:29:14 +01:00
f18a146d0f
Prompt to apply fee in admin
2017-08-23 11:22:18 +01:00
23ca228a40
Fix input width, Closes #16571
2017-08-23 10:55:00 +01:00
d29d677f5b
Merge branch 'master' of github.com:woocommerce/woocommerce
2017-08-22 15:43:33 -03:00
89a07a695e
Fixed indentation of wc-enhanced-select.js
2017-08-22 15:43:08 -03:00
1596979d75
Reload order items on add
2017-08-22 15:19:20 +03:00
44abd1a1b8
Min
2017-08-22 11:55:00 +01:00
394a426be7
Remove change from this.queue_update_checkout
2017-08-22 11:54:44 +01:00
38ac7e4ac0
Merge pull request #16486 from woocommerce/fix/16317
...
Sort multiselects alphabetically
2017-08-21 18:19:55 +01:00
d68291b3ac
Merge pull request #16086 from woocommerce/improvement/versions
...
Extensions version check.
2017-08-21 18:18:04 +01:00
b20ef5dcac
Styling
2017-08-21 15:53:08 +01:00
722749f14e
Add payment_method_selected event on checkout
2017-08-21 15:04:39 +02:00
d39f4bbe17
Merge branch 'master' into fix/16317
2017-08-18 11:37:59 -07:00
13acc510ef
Auto sort non-sortable multiselects
2017-08-18 11:35:12 -07:00
0dc1754b91
Merge branch 'master' into update/store-owner-newsletter
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
# assets/css/twenty-seventeen-rtl.css
# assets/css/twenty-seventeen.css
# assets/css/woocommerce-rtl.css
# assets/css/woocommerce.css
2017-08-18 18:21:55 +01:00
a9a93436fc
rename ajax method
2017-08-18 10:59:55 +01:00
1d95593131
Localise message
2017-08-18 10:58:11 +01:00
8720bde2f3
Minify
2017-08-18 10:39:45 +01:00
1efdb64b10
Remove css and js
2017-08-18 10:39:29 +01:00
e99471c0cd
Removed manual discounts code
2017-08-18 10:36:10 +01:00
f0afd14ed3
Sort multiselects alphabetically
2017-08-16 10:10:09 -07:00
d73e7e4f9d
Prevent unwanted double cart notices ( #16460 )
...
* Don't add shipping zone debug message when doing ajax
Prevent an issue where the "Customer matched zone" debug message is shown twice after first selecting a shipping method and then changing a product's quantity in cart and clicking Update cart.
* Don't pass event object to cart.update_cart
Prevent accidentally preserving cart notices when `wc_update_cart` event is triggered on body. If the event object is passed to update_cart() as the first param, it evaluates to true, forcing existing notices to be preserved.
* Pass custom arguments to cart.update_cart()
Instead of simply not passing the event object, pass any custom arguments, so it's possible to do something like: $( body ).trigger( 'wc_update_cart', true ); to still preserve notices if needed.
2017-08-16 11:34:35 +01:00
a2740cf7a5
Fix disappearing image when zoomed on touch devices
2017-08-16 10:20:14 +01:00
9bd01a8d44
Update add-to-cart-variation.js
2017-08-15 20:55:19 +02:00
a44a57b5d9
Improve tools page styling
2017-08-15 12:05:34 +01:00
ae80d12d80
Merge master
2017-08-14 11:12:09 -07:00
f12ac58932
Remove redundant CSS
...
The `nav.woo-nav-tab-wrapper` CSS rule overrides WordPress core rule with the same CSS.
We can remove that from WooCommerce.
2017-08-13 22:38:54 +03:00
b6fc6817be
Icon alignment
2017-08-11 17:58:26 +01:00
1b7bc60ea2
Fix fatal errors in bulk order item delete
2017-08-11 08:40:13 -07:00
fc0d729034
Remove figure margin/padding css
...
Closes #16396
2017-08-11 10:49:52 +01:00
9e70a74857
Styling
2017-08-10 13:29:32 -07:00
87858d1407
recalc on remove/add
2017-08-10 16:32:24 +01:00
3dc9f06f6a
Remove fixed discounts correctly
2017-08-10 12:06:03 +01:00
06381f28bd
Edit items rather than recreate
2017-08-10 11:38:09 +01:00
360286bbbf
Forgot js
2017-08-09 15:18:39 -07:00
a416ebe09b
It kind-of works.
2017-08-09 14:55:35 -07:00
c556facd41
Fix percent coupon and display
2017-08-09 19:02:10 +01:00
f95a1e4231
Ajax trigger for button
2017-08-09 14:55:53 +01:00
140771e759
Merge branch 'master' into improvement/versions
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
# assets/css/helper-rtl.css
# assets/css/helper.css
# assets/css/twenty-seventeen-rtl.css
# assets/css/twenty-seventeen.css
# assets/css/wc-setup-rtl.css
# assets/css/wc-setup.css
2017-08-09 10:08:06 +01:00
86a225a8d9
Newsletter signup
2017-08-08 18:00:47 +01:00
e82ca1c1a6
Styling and unknown plugin detection
2017-08-08 17:12:50 +01:00
63d82cea71
Merge branch 'pr/16108'
2017-08-08 12:44:50 +01:00
735a277e52
initial state
2017-08-08 12:44:36 +01:00
c4bafa7228
Merge pull request #16345 from woocommerce/selectwoo-update
...
selectWoo accessibility improvements
2017-08-07 17:23:34 +01:00
10fd50473b
Further accessibility improvements
2017-08-04 14:08:47 -07:00
fdd0e556e7
Focus on modal content instead of container
...
Prevent unwanted jumps in page scroll position when opening a modal.
2017-08-03 14:32:15 +03:00
d07ececd3f
Fix dark theme readability
2017-08-02 08:41:53 -07:00
8d277a263b
Sort by order + zone ID as a fallback in shipping zones
...
Fixes #16170
2017-07-19 10:16:50 +01:00
5642ee0c4d
Only check active plugins
2017-07-17 19:35:14 +01:00
0b606c8bbe
Styling and code tidy
2017-07-17 19:30:21 +01:00
8c17027eb6
Merge branch 'master' into improvement/versions
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
# assets/css/helper-rtl.css
# assets/css/helper.css
# assets/css/twenty-seventeen-rtl.css
# assets/css/twenty-seventeen.css
# assets/css/wc-setup-rtl.css
# assets/css/wc-setup.css
# assets/css/woocommerce-rtl.css
# assets/css/woocommerce.css
2017-07-17 18:04:28 +01:00
35c4c7fbe6
v2
2017-07-14 13:47:29 -07:00
129763dadf
Split up notices
2017-07-14 12:44:16 -07:00
40198bf2c8
Modal beta
2017-07-13 15:38:12 -07:00
20ebe8c193
Modal
2017-07-13 12:47:13 -07:00
37fc4c8f77
Ajaxify the product category filter ( #16110 )
...
* Ajaxify the product category filter
Closes #12773
* Min
2017-07-13 17:04:40 +01:00
287b0107b1
Merge pull request #16109 from woocommerce/fix/15858
...
add next button to pointers and allow it to be dismissed
2017-07-13 08:45:49 -07:00
c5443dddf5
Merge pull request #16107 from woocommerce/update/13171
...
Ajaxify widget remove from cart button
2017-07-13 08:41:36 -07:00
268166ecd0
Merge pull request #16093 from woocommerce/fix/15824
...
Fix select box styling in 2017
2017-07-13 08:28:51 -07:00
9d6bcfc6c2
Dark styles
2017-07-13 14:56:07 +01:00
d63cf8c52f
add next button to pointers and allow it to be dismissed
...
Closes #15858
2017-07-13 13:09:52 +01:00
bf9a7381dc
Coding improvements for datepicker range
2017-07-13 13:15:58 +02:00
7c321a2269
Ajaxify widget remove from cart button
...
Fixes #13171
2017-07-13 12:15:13 +01:00
771a4cab45
Minify meta boxes
2017-07-13 11:02:00 +01:00
6cee94bfa3
Merge pull request #15034 from widoz/master
...
Allow other product types to use the sale schedule inputs.
2017-07-13 10:59:31 +01:00
b355e016cd
Do notice in a pop-up
2017-07-12 12:38:19 -07:00
fdcf16bb60
Merge branch 'master' into update/15563
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
# assets/css/helper-rtl.css
# assets/css/helper.css
# assets/css/wc-setup-rtl.css
# assets/css/wc-setup.css
# assets/css/woocommerce-rtl.css
# assets/css/woocommerce.css
2017-07-12 16:18:13 +01:00
f110e81572
Fix select box styling in 2017
...
Fixes #15824
2017-07-12 15:39:12 +01:00
8dd21ec1c4
Resolve merge conflicts
2017-07-11 12:11:01 -07:00
0444cdef3c
Initial notice implementation
2017-07-11 11:59:39 -07:00
fd1cb2d67f
Merge pull request #16052 from woocommerce/feature/13189-refactored
...
Add select2 to layered nav
2017-07-11 12:39:33 -03:00
94b32e644a
HTML emails
2017-07-11 14:52:30 +01:00
3939f50ced
Download display in account/checkout
2017-07-11 13:45:35 +01:00
86038e8c41
Merge pull request #16058 from woocommerce/update/selectwoo
...
Make multiselects accessible in selectWoo
2017-07-10 19:24:54 -03:00
f2167e92d4
Latest selectWoo
2017-07-10 13:28:49 -07:00
a7582d50da
Merge pull request #16050 from woocommerce/update/15985
...
Use select2 in cart
2017-07-10 15:40:56 -03:00
a527a9566b
Add select2 to layered nav
2017-07-10 14:36:47 +01:00
555f093ac3
Use select2 in cart
...
Fixes #15985
2017-07-10 13:14:27 +01:00
79e3bbd0bf
Set allow one slide to false for flexslider
...
Closes #16002
2017-07-07 11:37:10 +01:00
8a8daabf26
Update with master and recompile assets
2017-07-06 09:06:30 -07:00
3ce4264723
Add select2 files back
2017-07-06 08:47:27 -07:00
ee87024d82
Merge pull request #15956 from woocommerce/add-cart-readdition-notice
...
Use ajax when restoring an item in the cart
2017-07-04 16:35:23 -03:00
002156d109
Minify
2017-07-04 16:34:58 -03:00
3180f456d2
Merge pull request #15893 from woocommerce/fix/gallery-height-with-no-cache
...
Force height for the gallery if the image is no loaded at time of init
2017-07-04 14:10:00 -03:00
7172d559c8
Fixed coding standards
2017-07-04 14:09:16 -03:00
00237a6de9
Merge pull request #15959 from woocommerce/update/15949
...
Extra error checking in terms page content
2017-07-04 12:25:44 -03:00
671f052641
Tweak terms template to check the woocommerce_shortcode is not present in the content.
2017-07-04 14:03:08 +01:00
c1de30fa38
Merge branch 'master' into fix/gallery-height-with-no-cache
...
# Conflicts:
# assets/js/frontend/single-product.min.js
2017-07-04 11:50:15 +01:00
2d52e6e398
Use ajax when restoring an item in the cart
2017-07-04 04:01:59 -05:00
342b051731
Only show most recent cart removal notice
2017-07-04 03:33:51 -05:00
3af45e1e35
Fixed chmod
2017-07-03 11:41:10 -03:00
38411f7fb2
#15915 Use shippingMethodView variable instead this in ajax callback inside the onAddShippingMethodSubmitted method
2017-07-02 05:14:45 +07:00
e8bd694a6e
Keep aria styles for backwards compat.
2017-06-30 13:17:24 -07:00
f6f229ac0e
Merge pull request #15828 from woocommerce/update/15825
...
Init zoom after slide is displayed
2017-06-30 08:34:07 -07:00
d78f088ba2
Force height for the gallery if the image is no loaded at time of init
2017-06-30 15:58:55 +01:00
c7e4be8f34
Update flexslider
2017-06-30 15:19:47 +01:00
77c938202f
Merge branch 'add/15602-store-street-level-address'
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
2017-06-30 15:00:51 +01:00
d6131f3a74
Field styling
2017-06-30 14:59:45 +01:00
09c9c6e359
Dont set everything up if key variable doesnt exist
2017-06-28 08:31:55 -07:00
f469312d76
Init zoom after slide is displayed
...
Closes #15825
2017-06-27 22:01:05 +01:00
f02c9376c4
Move calls to selectWoo()
2017-06-26 12:44:33 -07:00
ee9c762bdc
Enqueue selectWoo
2017-06-26 11:50:08 -07:00
1d9148241c
Merge pull request #15751 from woocommerce/feature/helper
...
Helper copy update
2017-06-23 16:17:24 +01:00
85e3c4d1f1
Helper: minor coding standards fixes
2017-06-23 12:47:30 +01:00
7e396de650
Helper: compresses stylesheet
2017-06-23 09:42:25 +01:00
ff18825068
Helper connection screen: reduces max width of the notice copy and makes the connection button match the style of the remaining buttons
2017-06-23 09:31:31 +01:00
29ba0040d0
Style CSV URL input box correctly
...
Closes #15735
2017-06-22 11:58:41 +01:00
24780e7ace
Fix example wrapping
2017-06-21 13:06:25 +01:00
d0266938bf
Recompile css
2017-06-19 10:13:27 -07:00
85134b91eb
Give the icon a background color
...
Fixes #15673
2017-06-19 13:06:54 +01:00
a1940f2da3
Grunt dev
2017-06-19 12:49:34 +01:00
594aa66f4e
3.1.0-rc.1
2017-06-14 16:07:22 -03:00
e9b64aec7b
Merge branch 'master' into fix/15574
2017-06-14 14:05:01 -03:00
9f5ff05269
Re-run grunt tasks
2017-06-14 17:58:42 +01:00
8e7e8c269f
Raise input padding so placeholder is not so squished
2017-06-14 17:56:18 +01:00
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
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
2702647f88
Start handle importer delimiter
...
This make able handle the delimiter input passing to mapping screen and to the AJAX importation process.
2017-06-12 17:47:20 -03:00
54a9387361
Show attribute data in admin list.
2017-06-12 13:37:52 +01:00
27d57e6019
More specific radio hiding
...
Closes #15538
2017-06-09 14:47:07 +01:00
c19da29223
Fixed a typo
2017-06-08 15:52:34 -03:00
5ee38c54c2
Option to disable reviews globally
2017-06-08 15:26:30 +01:00
b4040b1335
Translate quick edit text
2017-06-08 14:24:28 +01:00
43723f599f
Merge pull request #15475 from woocommerce/fix/14677
...
Switch to image if it's in the gallery for variations
2017-06-06 14:26:56 -03:00
fd7c154009
Optimise switch code
2017-06-06 14:16:56 +01:00
1863446daf
fresh fix for 14677 (without unnecessary commit history)
2017-06-06 13:57:22 +01:00
eddcb16e00
Update copy + css for zones
...
Closes #15031
2017-06-06 13:46:09 +01:00
ed0d0e2fbc
Update WCS banner heading spacing
2017-06-05 16:22:30 -04:00
4aec4efa67
Merge pull request #15432 from woocommerce/update/wcs-banner-responsive
...
Update WooCommerce Services extensions banner
2017-06-05 15:36:22 -03:00
d263b56438
Merge pull request #15448 from woocommerce/update/15447
...
Use prototype pattern and trigger wc_cart_button_updated after updating markup
2017-06-05 11:29:45 -07:00
527fa0d07a
Fixe CHMOD
2017-06-05 14:45:30 -03:00
2abb868715
Merge pull request #15451 from woocommerce/fix/15441
...
Fix button styling
2017-06-05 09:19:34 -07:00
70570f3745
Update WCS banner style
2017-06-05 11:30:42 -04:00
baf405fdcf
Update WCS banner image
2017-06-05 11:28:37 -04:00
4f72e9e914
Fix button styling
2017-06-05 14:46:57 +01:00
a348dedfb7
Merge pull request #15397 from woocommerce/update/add-activation-toggles-in-subscriptions
...
Update/add activation toggles in subscriptions
2017-06-05 14:29:36 +01:00
f22d30603d
Use prototype pattern and trigger wc_cart_button_updated after updating markup
...
Fixes #15447
2017-06-05 12:43:52 +01:00
d5cb320b7e
Font smoothing CSS
...
Closes #15434
2017-06-05 10:14:31 +01:00
e77c86a7bc
removes cursor from inactive toggles
2017-06-02 11:23:54 +01:00
09a3b3d0dd
updates active/inactive toggles on the Subscriptions tab
2017-06-01 13:14:38 +01:00
5369bae987
Merge branch 'master' into add/wcs-banners
2017-05-31 16:02:38 -03:00
ffed9a945e
Update CSS files
2017-05-31 09:37:38 -07:00
c53c83aebb
Tweak test and styling
2017-05-31 09:36:32 -07:00
10e8c2d82e
Use circular controls to indicate radio button on shipping wizard
...
Regenerate CSS and JS files
2017-05-31 09:35:10 -07:00
cd2da7fd07
Change style of checkbox in shipping wizard
2017-05-31 09:34:24 -07:00
c49fa38e2c
Make units controls look the same for touted and non-touted
...
Rename local functions to "location"
2017-05-31 09:33:50 -07:00
290fffd053
Update css files using grunt
2017-05-31 09:33:19 -07:00
2d039c71e9
Fix jshint reserved word error and update minified wizard JavaScript.
2017-05-31 09:31:59 -07:00
466cee9fc9
Update tax rates upon store location change.
2017-05-31 09:31:59 -07:00
774d8c667e
Implement radio input toggling using the checkbox styles on wizard shipping step.
2017-05-31 09:31:57 -07:00
1122faf760
Implement WooCommerce Services NUX in Setup Wizard:
...
- Rename "shipping locale" to "shipping location"
- Move tax setup to to shipping location page
- Rename shipping & taxes to just shipping
- Implement radio button selection to enable/disable shipping
- Add checkbox for installing WooCommerce services
- Start updating wc-admin css and javascript
2017-05-31 09:31:57 -07:00
e7672d6572
Enable WCS banner on shipping extension page
2017-05-31 09:27:17 -06:00
870e3ddea2
Add WCS banner addons block markup
2017-05-31 09:26:17 -06:00
532ddfa6b0
Merge conflicts
2017-05-31 12:23:52 +01:00
85b8d8661a
Merge pull request #14595 from woocommerce/feature/helper
...
Helper: First pass at merging the Helper plugin into WooCommerce
2017-05-30 20:39:08 +01:00
1dc7e507b1
Helper: Redesign (work in progress)
2017-05-30 20:50:14 +03:00
2177ef93cd
Use formatted weight and dimensions for variations
...
Fixes #15327
2017-05-29 10:31:31 +01:00
7f0fcac090
Merge branch 'feature/product-csv-import-export' into feature/product-csv-import-non-existing-data
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
2017-05-25 17:58:34 +01:00
c790e4be7c
Fix styling in firefox
2017-05-25 15:39:53 +01:00
b821c24955
Restore top actions
2017-05-25 12:36:03 +01:00
a3f35d6e96
Checkout fallback regex tweaks ( #15210 )
...
* *Improve JSON regex #15159
* Run parse on invalid JSON to ensure validity and make regex more greedy.
Closes #15161
* Add is_valid_json helper
* Improve return
2017-05-25 11:20:05 +01:00
1837abbd99
Increase the timeout so the sizing works after changing variation image
...
Closes #15251
2017-05-24 17:15:22 +01:00
5f28c733cc
Merge pull request #15234 from woocommerce/update/14630
...
Update serializejson to 2.8.1
2017-05-24 09:21:10 -03:00
c5d7dfba6c
Feedback
2017-05-23 19:46:46 +01:00
15f47e00a2
Merge branch 'master' into feature/13088
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
# assets/css/twenty-seventeen-rtl.css
# assets/css/twenty-seventeen.css
# assets/css/woocommerce-rtl.css
# assets/css/woocommerce.css
2017-05-23 16:35:17 +01:00
f833aadf39
Merge pull request #14975 from tractus/master
...
Added namespace to jQuery events that are removed in VariationForm
2017-05-23 16:27:49 +01:00
a1a79e57b5
Merge branch 'master' into pr/14896
...
# Conflicts:
# assets/js/frontend/single-product.min.js
2017-05-23 16:22:18 +01:00
2d479e0580
Update serializejson to 2.8.1
...
Closes #14630
2017-05-23 15:27:53 +01:00
Mike Jolley
Joost de Valk
Claudiu Lodromanean
José Marques
Umangvaghela
Jonathan Belcher
Claudio Sanches
Gabor Javorszky
Manos Psychogyiopoulos
Emil Kjær Eriksen
ragulka
James Koster
iickoo
Rami Yushuvaev
Ninos Ego
Caleb Burks
Sofyan Sitorus
Konstantin Kovshenin
Valerie K
Faisal Alvi
Nabeel Sulieman
Jeff Stieler
Nabeel Sulieman