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 |
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
|
89ddda9ff6
|
Added new api key generation methods
|
2015-06-08 19:41:35 -03:00 |
|
Mike Jolley
|
3154b08d3e
|
Replace CDN select2 with local copy
Closes #7287
|
2015-02-04 15:00:14 +00:00 |