Commit Graph

7302 Commits

Author SHA1 Message Date
Mike Jolley 26b5ffa3d0 Only append generator tag on HTML pages Closes #5113 2014-03-12 14:38:03 +01:00
Coen Jacobs fa089f7c0d Merge pull request #5077 from woothemes/transient-expiration
set_transient calls should have expiration to prevent autoloading
2014-03-12 13:02:42 +01:00
Coen Jacobs 3617316357 Updated expiry times for transients 2014-03-12 12:58:41 +01:00
Mike Jolley 9164cca62f Merge pull request #5115 from thenbrent/woocommerce_no_available_payment_methods_filter
Add no_available_payment_methods_message filter
2014-03-12 11:36:02 +00:00
Mike Jolley 8523fe8f34 Merge pull request #5114 from thenbrent/woocommerce_cart_totals_fee_html_filter
Add 'woocommerce_cart_totals_fee_html' filter
2014-03-12 11:35:43 +00:00
Mike Jolley d78016b216 Merge pull request #5108 from splashingpixels/admin-bulk-sale-price
variation bulk sale price edit over reaching causing errors on save
2014-03-12 11:35:21 +00:00
Mike Jolley 71bcef64a1 Merge pull request #5104 from InoPlugs/patch-2
Update class-wc-checkout.php
2014-03-12 11:34:29 +00:00
Mike Jolley 6c313c95af Merge pull request #5101 from justinstern/master
Don't trailingslash Order Cancel URLs with a Query String
2014-03-12 11:31:43 +00:00
thenbrent bcd3c71c7d Add no_available_payment_methods_message filter 2014-03-12 21:14:06 +10:00
thenbrent 18efa7341a Add 'woocommerce_cart_totals_fee_html' filter 2014-03-12 21:11:22 +10:00
splashingpixels be85affc89 variation bulk sale price edit over reaching causing errors on save 2014-03-11 17:03:55 -07:00
InoPlugs Webdesign a284d7fe69 Update class-wc-checkout.php
We need this hook to mark the fees our plugin (additional fee based on gateway) adds to the the order. Otherwise we can't tell if a fee was added by the user (Add fee button), by another plugin or by our plugin.
2014-03-11 19:48:51 +01:00
James Koster 8238739987 enable keyboard shortcuts in prettyPhoto 2014-03-11 11:14:25 +00:00
justinstern 6dfce64e47 Don't trailingslash Order Cancel URLs with a Query String
With non-pretty permalinks enabled, this was producing a URI like
http://example.com/?page_id=7/  That final unnecessary trailing slash
messes up some redirect gateways that are passed the cancel URL
2014-03-11 00:04:49 -04:00
Andrew Benbow 2f5fb72a9c Update class-wc-gateway-paypal.php
modify currency error message to include both sent and returned currencies for comparison
2014-03-10 23:23:30 +00:00
Coen Jacobs e2be27e7b5 Minified checkout.js for #5092 2014-03-10 17:22:17 +01:00
Mike Jolley 24206298d7 Merge pull request #5092 from wicaksono/master
Allow city field to use another input method
2014-03-10 15:36:13 +00:00
Niko Wicaksono e1d3cb6dd8 Allow city field to use another input method 2014-03-10 10:05:35 +07:00
Coen Jacobs 03163c54b0 set_transient calls should have expiration to prevent autoloading 2014-03-07 09:29:01 +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
Mike Jolley fbeb3bc822 Update LESS compiler and less files #5070 2014-03-06 17:29:52 +01:00
Mike Jolley 90914cc3c8 Update LESS compiler and less files #5070 2014-03-06 16:23:43 +00:00
Coen Jacobs 53d5244aa1 Changelog bump for 2.1.5 changes 2014-03-06 16:32:36 +01:00
splashingpixels 7a28434ab4 get_related fixed tags OR query not excluding product ID 2014-03-06 16:27:13 +01:00
Mike Jolley a955a5ba5d Fallback for add ons page loading 2014-03-06 16:26:47 +01:00
Mike Jolley 7aac055895 When getting downloadable files, check access_expires too Closes #5060 2014-03-06 16:26:47 +01:00
Mike Jolley e2ea31fc94 pedantic nonce checking 2014-03-06 16:26:47 +01:00
Mike Jolley 429aaca9c9 Fix bulk edit % increase and decrease Closes #5068 2014-03-06 16:26:47 +01:00
Mike Jolley 6dff93a0fd We can hide suffix for prices in admin lists Closes #5048 2014-03-06 16:26:47 +01:00
Mike Jolley d303e5d072 When dealing with fixed_product discounts, when doing it for the line, multiple by product qty Closes #5054 2014-03-06 16:26:47 +01:00
Mike Jolley 2c13c5c24e Fix variation price display by checking if a variation is actually stock managed before comparing to stock amount Closes #5059 2014-03-06 16:26:47 +01:00
Mike Jolley 6e466d4fdb Set default for $plain_text variable. Closes #5051 2014-03-06 16:26:47 +01:00
Mike Jolley c3d5111c8d Check existence of nonce Closes #5050 2014-03-06 16:26:47 +01:00
Mike Jolley 156098edb9 Fallback for add ons page loading 2014-03-06 15:25:05 +00:00
Mike Jolley 9068da2ece When getting downloadable files, check access_expires too Closes #5060 2014-03-06 14:35:25 +00:00
Mike Jolley 88c666968e Merge pull request #5043 from splashingpixels/related-products
get_related fixed tags OR query not excluding product ID
2014-03-06 13:26:26 +00:00
Mike Jolley a553fd4956 pedantic nonce checking 2014-03-06 13:11:20 +00:00
Mike Jolley ef0567ac4f Fix bulk edit % increase and decrease Closes #5068 2014-03-06 13:03:12 +00:00
Mike Jolley de2b608db3 We can hide suffix for prices in admin lists Closes #5048 2014-03-06 12:44:05 +00:00
Mike Jolley 24e884a480 When dealing with fixed_product discounts, when doing it for the line, multiple by product qty Closes #5054 2014-03-06 12:29:25 +00:00
Mike Jolley ba466b3de9 Fix variation price display by checking if a variation is actually stock managed before comparing to stock amount Closes #5059 2014-03-06 12:07:28 +00:00
Mike Jolley 8971dc0d92 Set default for $plain_text variable. Closes #5051 2014-03-06 11:57:47 +00:00
Mike Jolley d42bb7a285 Check existence of nonce Closes #5050 2014-03-06 11:37:48 +00: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
Mike Jolley d60e98aefb load_textdomain first 2014-03-05 11:33:34 +01:00
Mike Jolley eda56fd1bd Update translations 2014-03-05 11:33:32 +01:00