Commit Graph

1260 Commits

Author SHA1 Message Date
Coen Jacobs 34726ab6bc Merge branch '2.1'
Conflicts:
	i18n/languages/woocommerce-admin.pot
	i18n/languages/woocommerce.pot
	includes/admin/post-types/class-wc-admin-cpt-product.php
	includes/class-wc-form-handler.php
	package.json
	readme.txt
	woocommerce.php
2014-04-30 14:30:42 +02:00
Mike Jolley 96507fa3f4 typo in readme 2014-04-29 15:46:35 +01:00
Mike Jolley 92e98be218 Update read me file for 2.2 commits 2014-04-29 15:37:48 +01:00
Mike Jolley 5da8bee690 2.1.8 read me and versioning 2014-04-29 15:27:10 +01:00
Coen Jacobs 53889db5e4 This branch is now 2.1.8-bleeding 2014-04-10 16:46:18 +02:00
Coen Jacobs 4afeb7926c Merge branch 'refs/heads/2.1'
Conflicts:
	i18n/languages/woocommerce-admin.pot
	i18n/languages/woocommerce.pot
	includes/class-wc-form-handler.php
	package.json
	readme.txt
	templates/checkout/form-shipping.php
	templates/emails/email-addresses.php
	woocommerce.php
2014-04-10 16:42:08 +02:00
Mike Jolley 7d2f778eb3 Updated read me 2014-04-10 14:02:54 +01:00
Coen Jacobs 2850b07f8e This branch is now 2.1.7-bleeding 2014-03-25 16:09:22 +01:00
Coen Jacobs 78a4448703 Merge branch 'refs/heads/2.1'
Conflicts:
	i18n/languages/woocommerce-admin.pot
	i18n/languages/woocommerce.pot
	package.json
	readme.txt
	woocommerce.php
2014-03-25 16:05:36 +01:00
Coen Jacobs 95065b65ca Version bump for 2.1.6 2014-03-25 15:33:49 +01:00
Mike Jolley 8d01dc9a67 readme 2014-03-25 13:41:53 +00:00
Mike Jolley a02f584d0d Update readme for cherry picks 2014-03-24 12:14:25 +00:00
Mike Jolley 4e0ad3282f Update change log 2014-03-20 10:04:41 +00:00
Coen Jacobs 911f7f8a46 This branch is now 2.1.6-bleeding 2014-03-06 17:49:47 +01:00
Coen Jacobs 4d24dad5f6 Merge branch 'refs/heads/2.1'
Conflicts:
	package.json
	readme.txt
	woocommerce.php
2014-03-06 17:48:12 +01:00
Coen Jacobs 895759954e Version bump to 2.1.5 2014-03-06 17:32:08 +01:00
Coen Jacobs 53d5244aa1 Changelog bump for 2.1.5 changes 2014-03-06 16:32:36 +01:00
Coen Jacobs f6ca02e099 This branch is now 2.1.5-bleeding 2014-03-05 13:43:11 +01:00
Coen Jacobs 1bfc590c5e Merge branch 'refs/heads/2.1'
Conflicts:
	assets/js/frontend/checkout.min.js
	package.json
	readme.txt
	woocommerce.php
2014-03-05 13:41:49 +01:00
Coen Jacobs f101e15504 WC 2.1.4 stable tag bump 2014-03-05 11:35:20 +01:00
Coen Jacobs 0efe995395 Changelog update for plugin_textdomain switch 2014-03-05 11:34:38 +01:00
Coen Jacobs ea710976ab Changelog bump for 2.1.4 2014-03-05 11:25:08 +01:00
Coen Jacobs ac9e85453e This branch is now 2.1.4-bleeding 2014-02-27 17:11:13 +01:00
Coen Jacobs a6f91bfc82 Merge branch 'refs/heads/2.1'
Conflicts:
	assets/js/frontend/checkout.min.js
	includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
	package.json
	readme.txt
	woocommerce.php
2014-02-27 17:09:53 +01:00
Coen Jacobs f76dba5abe 2.1.3 version bump 2014-02-27 15:58:57 +01:00
Coen Jacobs e155137ad0 Final changelog bump for 2.1 2014-02-27 15:55:13 +01:00
Coen Jacobs ce970b185d Moar 2.1.3 changelog updates 2014-02-27 15:48:57 +01:00
Daniel Espinoza 45611628a7 Readme update for upcoming 2.1.3 release 2014-02-27 15:35:05 +01:00
Coen Jacobs fff37482b6 Changelog bump for #4942 2014-02-25 10:25:39 +01:00
Coen Jacobs 3e4b79e6c9 Changelog bump for #4856 2014-02-18 12:31:39 +01:00
Coen Jacobs c29a3dc0cf Changelog bump for #4847 2014-02-18 10:49:19 +01:00
Coen Jacobs 756a167198 Changelog bump for WC 2.1.3 release 2014-02-17 16:37:42 +01:00
Coen Jacobs d0e42aa8f0 Changelog bump for #4813 2014-02-17 15:20:25 +01:00
Coen Jacobs 0cb792b916 Changelog bump for #4814 and #4806 2014-02-17 14:29:36 +01:00
Coen Jacobs 27ff5ec160 Changelog bump for #4822, #4842, #4826, #4827, #4824, #4825 2014-02-17 13:42:36 +01:00
Coen Jacobs e21936edba Changelog bump for #4831 2014-02-17 13:34:27 +01:00
Coen Jacobs d8c54b11f6 Changelog bump for #4809 2014-02-17 13:32:55 +01:00
Coen Jacobs 1a084cc90e Changelog bump for #4811 2014-02-17 13:29:02 +01:00
Coen Jacobs cd81918618 Changelog bump for #4802, #4799, #4804 2014-02-17 10:43:02 +01:00
Coen Jacobs d9888648d0 Changelog bump for #4786, #4785, #4791 and #4796 2014-02-14 12:55:50 +01:00
Coen Jacobs 22f37222e3 Changelog bump for #4788 2014-02-14 12:00:46 +01:00
Coen Jacobs 7afe12e696 Changelog: Enforce a static base for product permalink structures 2014-02-14 11:47:38 +01:00
Coen Jacobs c0eb6a5afa Out of stock counter use correct variable changelog bump #4790 2014-02-14 09:23:19 +01:00
Coen Jacobs 5fd62e202a Changelog for 'Added United Arab Emirates Dirham currency' #4793 2014-02-14 09:07:55 +01:00
Coen Jacobs d94a4b70d3 This branch is now 2.1.3-bleeding 2014-02-13 22:50:20 +01:00
Coen Jacobs 87a3fdb94f Merge branch 'refs/heads/2.1'
Conflicts:
	package.json
	readme.txt
	woocommerce.php
2014-02-13 22:48:13 +01:00
Coen Jacobs ffeb88447e Stable tag bumps for 2.1.2 2014-02-13 22:30:12 +01:00
Coen Jacobs 6aa631c22f Changelog bump for multiple localization updates 2014-02-13 22:28:48 +01:00
Coen Jacobs bf17c315de Fixed "Shipping via" label in PayPal changelog bump 2014-02-13 21:44:07 +01:00
Coen Jacobs 60091d5825 Changelog bump for #4774 2014-02-13 16:56:01 +01:00