Commit Graph

15 Commits

Author SHA1 Message Date
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
Mike Jolley 793d86c9c3 [2.5] Fix scroll on ios
Closes #10145
2016-01-25 11:31:24 +00:00
Mike Jolley 14eeb9f936 Zones first draft with backbone saving of zone names 2015-12-10 11:55:03 +00:00
Claudio Sanches 0e1d342e26 Updated select2 to 3.5.4, closes #9781 2015-12-08 15:00:18 -02:00
Mike Jolley 56f274b68b non-functional Mockup for the shipping zones interface 2015-12-08 12:45:18 +00:00
Claudio Sanches ee1263db9c Minify 2015-07-10 20:17:47 -03:00
Mike Jolley 3ec4003bbb Move add variation button and toolbars 2015-07-11 00:04:16 +01:00
Claudio Sanches 501742b07f Updated grunt dependencies 2015-07-10 18:48:04 -03:00
Claudio Sanches c353a3a9ea Minify files 2015-06-09 11:37:04 -03:00
Claudio Sanches 89ddda9ff6 Added new api key generation methods 2015-06-08 19:41:35 -03:00
Mike Jolley 877d91956f Minify 2015-06-08 11:17:07 +01:00
Claudio Sanches 65580cd967 Minify files for #8279 2015-06-03 17:02:19 -03:00
Mike Jolley e122a8258c Minification 2015-05-28 12:29:33 +01:00
Claudio Sanches a77e9d4023 Compress with Grunt all external libraries 2015-05-25 11:42:42 -03:00
Mike Jolley 3154b08d3e Replace CDN select2 with local copy
Closes #7287
2015-02-04 15:00:14 +00:00