Commit Graph

380 Commits

Author SHA1 Message Date
Mike Jolley fab8a871aa Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	includes/admin/class-wc-admin-assets.php
2016-02-10 14:12:39 +00:00
Mike Jolley 75cbb74520 Rating widget standards 2016-02-09 15:18:27 +00:00
Mike Jolley 352184cc06 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	i18n/languages/woocommerce.pot
#	includes/abstracts/abstract-wc-payment-gateway.php
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/admin/settings/class-wc-settings-shipping.php
#	includes/wc-core-functions.php
#	uninstall.php
2016-02-05 14:58:48 +00:00
Claudio Sanches 267c280a6b POT for 2.5 2016-01-18 11:48:53 -02:00
Claudio Sanches 64a176920d RC3 tag and POT 2016-01-15 13:54:52 -02:00
Claudio Sanches 626c1a127a POT 2016-01-12 14:03:20 -02:00
Mike Jolley b5146f18fa POT file 2016-01-11 16:31:00 +00:00
Mike Jolley 1076854608 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/class-wc-shipping.php
#	includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
#	includes/shipping/flat-rate/includes/class-wc-eval-math.php
#	includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
#
includes/shipping/legacy-international-delivery/class-wc-shipping-legacy
-international-delivery.php
#
includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d
elivery.php
2016-01-11 11:48:18 +00:00
Claudio Sanches 2607e68c82 2.5.0-RC1 2016-01-05 13:52:19 -02:00
Claudio Sanches 89581d1541 Setup Wizard and no Onboarding Wizard 2015-12-18 17:05:16 -02:00
Claudio Sanches be55385204 POT 2015-12-18 16:19:23 -02:00
Claudio Sanches b86741ea75 POT 2015-12-18 16:18:27 -02:00
Mike Jolley aab4e1cfa0 Min 2015-12-16 11:05:01 +00:00
Claudio Sanches ba67b7d219 POT 2015-12-09 13:24:36 -02:00
Mike Jolley 7f3b65885b POT 2015-12-04 19:10:22 +00:00
Mike Jolley 27a7793f00 Min and POT 2015-11-25 18:46:57 +00:00
Ibrahim Ibn Dawood 7e32eb19ea updated pot file with strings from ratings filter 2015-11-13 15:19:46 +05:30
Mike Jolley af4f775ff0 Minify 2015-11-05 14:37:23 +00:00
Mike Jolley 7fdb93329c Merge branch 'revised-single-variation-cart-template'
Conflicts:
	includes/admin/views/html-admin-page-status-report.php
2015-11-02 11:26:49 +00:00
Claudio Sanches f1c77b6061 POT 2015-10-06 10:37:59 -03:00
Claudio Sanches 2c14079bd6 Updated the i18n/languages/README.md translate url 2015-10-06 10:32:47 -03:00
Claudio Sanches 24adcfa899 POT 2015-08-24 13:27:02 -03:00
Mike Jolley b9381d1495 Revert uniform fix - looking into doing it in-theme 2015-08-21 19:24:39 +01:00
Claudio Sanches dc4ab408d0 POT 2015-08-20 13:47:30 -03:00
Mike Jolley 7f247880cc grunt dev 2015-08-17 11:28:16 +01:00
Claudio Sanches a5b4d7ff1d POT 2015-08-13 23:37:08 -03:00
Claudio Sanches 0c48134554 POT 2015-08-12 15:49:55 -03:00
Claudio Sanches f16468c33c Version 2.4.2 2015-08-11 14:23:50 -03:00
Claudio Sanches b1f0da9d76 Version 2.4.1 2015-08-10 18:44:32 -03:00
Claudio Sanches e12493073e POT for 2.4.0 2015-08-10 12:39:47 -03:00
Claudio Sanches 9bc3937689 Updated POT 2015-08-07 10:37:55 -03:00
Claudio Sanches e901114c23 Updated POT 2015-08-07 10:19:08 -03:00
Claudio Sanches 0e70aed254 POT 2015-07-31 13:20:56 -03:00
Claudio Sanches 6a62b63813 POT 2015-07-27 15:08:56 -03:00
Claudio Sanches 2d1fd81b2d POT 2015-07-15 16:40:55 -03:00
Claudio Sanches 6341b93fed POT 2015-07-13 11:03:14 -03:00
Mike Jolley 2834eff221 Merge branch 'variations-8477'
Conflicts:
	assets/js/frontend/add-to-cart-variation.js
	assets/js/frontend/add-to-cart-variation.min.js
	assets/js/frontend/add-to-cart.min.js
	assets/js/frontend/checkout.min.js
	assets/js/frontend/geolocation.min.js
2015-07-10 11:37:05 +01:00
Mike Jolley 8161cbd095 Change remove buttons into links 2015-07-08 23:08:07 +01:00
Mike Jolley e122a8258c Minification 2015-05-28 12:29:33 +01:00
MindyPostoff 71c15a60cc Update woocommerce.pot 2015-04-22 16:43:43 -04:00
Mike Jolley 09a0f2e20d POT 2015-03-13 10:46:19 +00:00
Claudio Sanches bb8ef2a51f POT 2015-02-20 14:19:20 -02:00
Claudio Sanches fa638d288e POT 2015-02-17 14:43:22 -02:00
Claudio Sanches aa55a64010 POT 2015-02-12 14:44:47 -02:00
Mike Jolley a80d069a21 Version bump 2015-02-12 00:39:58 +00:00
Claudio Sanches dd0d8b7b26 POT 2015-02-11 16:11:25 -02:00
Mike Jolley 2da86accc8 POT 2015-02-11 15:00:36 +00:00
Claudio Sanches 039c496354 Language files for 2.3.0 2015-02-11 10:24:14 -02:00
Claudio Sanches 736ed330c8 Fixed a typo in the frontend colors notice 2015-02-10 14:08:05 -02:00
Claudio Sanches a01a4dd171 Updated the .pot files 2015-02-10 14:02:09 -02:00