Commit Graph

216 Commits

Author SHA1 Message Date
Mike Jolley 86993a4f70 Merge branch 'master' into update/13624 2018-06-07 10:30:52 +01:00
claudiulodro 4e046f2afe Recompile for RC1 2018-05-09 11:01:54 -07:00
Mike Jolley ffbbf08b61 Zoom improvements for mobile 2018-05-08 14:48:25 +01:00
claudiulodro eeb97510eb Recompile and prepare for beta 2 2018-05-03 09:46:40 -07:00
claudiulodro 4f84364631 Recompile everything 2018-04-18 10:04:02 -07:00
Mike Jolley 860e7a5d23 Merge branch 'master' into update/gdpr-checkout-customizer 2018-04-16 18:02:28 +01:00
Mike Jolley 3140a0fb62 More customistion options for terms and conditions. 2018-04-06 11:43:30 +01:00
claudiulodro 32b85885b4 Recompile assets 2018-01-11 09:10:29 -08:00
claudiulodro b5271064c2 Resolve conflicts 2018-01-05 10:47:27 -08:00
claudiulodro fd18d24ddd Recompile and version for beta 2 2018-01-05 10:10:17 -08:00
Mike Jolley 14afff129c Add appropriate column widths and fix up price method for consistentcy. 2018-01-05 12:23:08 +00:00
Andrew Minion 40d9efc4b8 add button for creating coupons to coupon blank state
Makes it more user-friendly for someone unfamiliar with WordPress/WooCommerce, and even for those who are familiar and don’t immediately see the typical “Add Coupon” button in the top left corner by the header.
2017-12-27 11:53:20 -05:00
Gareth Allison 29cc03c798 Updates the word `e-commerce` to `eCommerce` in the plugin description to be in line with the Woo and Automattic language & writing style. 2017-12-19 16:12:07 +02:00
claudiulodro a10dbbde48 Recompile everything 2017-12-12 11:38:44 -08:00
Jonathan Belcher f4d6b6f68f Merge Commit 2017-12-07 12:10:00 -05:00
Jonathan Belcher 885f869d40 Merge commit 2017-12-07 12:02:55 -05:00
Jonathan Belcher 937cdbf230 Merge commit 2017-12-07 11:50:42 -05:00
Jonathan Belcher a2743e6d25 Rebuild CSS 2017-12-06 12:08:28 -05:00
Mike Jolley 0a9485c465 Merge branch 'master' into feature/11259
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	includes/admin/list-tables/class-wc-admin-list-table-products.php
#	includes/class-wc-install.php
#	includes/wc-update-functions.php
2017-12-04 14:14:03 +00:00
Mike Jolley d8921de735 min 2017-12-04 13:45:52 +00:00
Mike Jolley 98bebd14f2 Hooks for columns and preview list tables 2017-11-21 16:22:43 +00:00
Mike Jolley 2aeaf59f5c Update image loading path 2017-11-21 15:05:08 +00:00
Mike Jolley ce47fa65c2 Changelog + grunt 2017-10-11 10:50:39 +01:00
claudiulodro 49d4000484 potfile 2017-09-27 13:54:13 -07:00
Mike Jolley 2f19edd024 grunt and version 2017-09-08 17:49:39 +01:00
Mike Jolley a4c100f905 POT update 2017-08-30 21:23:44 +01:00
Mike Jolley 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
Mike Jolley 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
Claudio Sanches 594aa66f4e 3.1.0-rc.1 2017-06-14 16:07:22 -03:00
Claudio Sanches cb4ea0c356 3.1.0-beta.2 2017-06-07 18:13:20 -03:00
Claudio Sanches 01d3f780eb POT 2017-05-31 16:11:41 -03:00
Mike Jolley 532ddfa6b0 Merge conflicts 2017-05-31 12:23:52 +01:00
Mike Jolley 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
Mike Jolley 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
Mike Jolley a1a79e57b5 Merge branch 'master' into pr/14896
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-05-23 16:22:18 +01:00
Claudio Sanches d6b2fbedc0 POT 2017-04-04 09:23:49 -03:00
Mike Jolley 1bc194945f Version bump and POT 2017-03-24 15:11:55 +00:00
Mike Jolley e57aa55894 POT file update 2017-03-21 13:24:57 +00:00
Claudio Sanches 95d36bd399 POT 2017-03-15 15:57:50 -03:00
Claudio Sanches 095e062d74 POT 2017-03-15 14:00:42 -03:00
Claudio Sanches 59c2849736 Changed version 2.7 to 3.0 2017-03-15 13:36:53 -03:00
Mike Jolley 8951bef0ee Version and minification 2017-02-28 19:11:41 +00:00
Claudiu Lodromanean 4a4de2a951 Americanize some words 2017-02-27 14:59:37 -08:00
Mike Jolley 790dd57933 Apologise -> american english
Closes #13370
2017-02-27 17:39:08 +00:00
Claudio Sanches 1eccb65d85 Fixed coding standards 2017-02-24 17:30:41 -03:00
Claudio Sanches 5294e43350 2.7 beta 4 2017-02-24 17:20:23 -03:00
Claudio Sanches 84d4d449d0 2.7 beta 3 2017-02-17 16:10:39 -02:00
Mike Jolley d8a00b97a1 Minify 2017-02-16 10:44:43 +00:00
Claudio Sanches f2767dbf5e 2.7.0-beta-2 2017-02-09 15:08:39 -02:00
Mike Jolley de6d1d23be Merge branch 'fix-12922'
# Conflicts:
#	assets/js/frontend/single-product.js
2017-01-26 14:59:30 +00:00