Mike Jolley
97b1e176d2
Merge branch 'downloadable-files-2.1'
...
Conflicts:
assets/css/admin.css
2013-09-23 12:44:35 +01:00
Mike Jolley
71cb94ebfa
Simpler tax rate check which Closes #3813
...
Could do with some more testing @ChromeOrange, and applying to .15 if
ok @coen
2013-09-23 12:44:15 +01:00
Mike Jolley
96a7a4b730
Restructure 'file_paths' to allow for names ( Closes #3320 ) etc. For #2765 .
...
@coenjacobs @justinstern @maxrice These are major changes - CC ing you
guys in to take a quick look through. I know some extensions such as
vouchers will be affected.
2013-09-20 17:01:09 +01:00
Coen Jacobs
f0fe86a8ac
Merge branch 'master' of https://github.com/woothemes/woocommerce
2013-09-20 15:51:50 +02:00
Coen Jacobs
e035864c8a
Check for existing array before using key. Closes #3807
2013-09-20 15:51:06 +02:00
James Koster
6294b916e4
tweaked icon mixins
2013-09-20 12:08:56 +01:00
Mike Jolley
b93df4e706
Excl and incl. display options for prices, and suffix to add additonal info and prices. Closes #1506 .
2013-09-19 16:31:54 +01:00
Mike Jolley
4ef07f6a66
Cleanup defaults. Closes #3778
2013-09-19 15:02:17 +01:00
Mike Jolley
512f2caac4
Merge pull request #3784 from karennaylor/master
...
add pattern matching to local delivery postcodes
2013-09-19 06:43:53 -07:00
Mike Jolley
3ee6e2fa22
Validate rules, instead of doing it by key. Closes #3792 .
2013-09-19 14:39:53 +01:00
Mike Jolley
87d7fce7c3
Merge pull request #3800 from BFTrick/tweak-new-order-email-copy
...
Tweaking New Order Email Description
2013-09-19 04:35:07 -07:00
Mike Jolley
cd8722a495
Merge pull request #3802 from thenbrent/fix-coupon-checks
...
Fix coupon checks in cart
2013-09-19 04:34:33 -07:00
thenbrent
fb548d145e
Fix logic on coupon check
2013-09-18 17:02:56 -07:00
thenbrent
13e337b82d
Fix coupon checks in cart
2013-09-18 16:49:29 -07:00
Patrick Rauland
885a95b21d
*sigh* forgot a period in the new order description
2013-09-18 14:23:14 -05:00
Patrick Rauland
af8919f1de
tweaking new order email description
2013-09-18 14:18:40 -05:00
Mike Jolley
ee0ea942d7
Merge pull request #3676 from dominic-p/view-order-template
...
Add template for single order view in my account
2013-09-17 03:49:43 -07:00
Mike Jolley
d11d732717
Merge pull request #3788 from dimitrov-adrian/patch-5
...
BG Language improving.
2013-09-17 03:42:58 -07:00
Mike Jolley
72a3a6ad7c
Merge pull request #3791 from ragulka/edit-address-title-filter
...
Add 'woocommerce_my_account_edit_address_title' filter
2013-09-17 03:42:45 -07:00
Mike Jolley
17ca80cdad
Merge pull request #3789 from rnt/master
...
makepot and pot update
2013-09-17 03:39:13 -07:00
Illimar Tambek
c599c5ecbe
Add 'woocommerce_my_account_edit_address_title' filter
2013-09-17 12:14:48 +03:00
Renato Covarrubias
f99530bb1f
Sorry, this will be locked
2013-09-16 20:51:13 -03:00
Renato Covarrubias
16e39aaf0b
es_ES update
2013-09-16 20:49:40 -03:00
Renato Covarrubias
d7c1b52973
pot file updates
2013-09-16 20:42:23 -03:00
Renato Covarrubias
58db9cafe1
I love create pot, from repository root dir
2013-09-16 20:41:16 -03:00
Renato Covarrubias
551d63927d
Merge remote-tracking branch 'upstream/master'
2013-09-16 20:24:34 -03:00
Renato Covarrubias
1861ab04e1
Update es_ES po with Sep 5 code
2013-09-16 20:24:03 -03:00
Dominic
d06a15ea72
Add a template for view order shortcode
...
Instead of hard coding the HTML into the shortcode definition.
2013-09-16 14:57:10 -07:00
James Koster
9fbf61073a
pretty photo uses new icon font
2013-09-16 15:24:42 +01:00
Mike Jolley
5f7753b343
Checkout error hook
...
@coenjacobs useful for .15 IMO
2013-09-16 14:55:21 +01:00
Mike Jolley
23c59a4d08
Merge pull request #3783 from greguly/patch-1
...
Fixes blank page error
2013-09-16 04:48:06 -07:00
Mike Jolley
b377217d1b
Compat with brands - filters should be prepended with filter_
...
@coenjacobs can this be applied to .15?
2013-09-16 12:43:16 +01:00
Adrian Dimitrov
97f534b14f
BG Language improving.
2013-09-16 12:14:57 +03:00
Coen Jacobs
2754e4bb69
Do not load removed helper abstract. Closes #3787
2013-09-16 10:33:44 +02:00
Karen Naylor
5c40d863e1
add pattern matching to local delivery postcodes
2013-09-14 16:08:17 +01:00
Gabriel Reguly
a5f2b01219
Fixes blank page error
...
Fix to avoid blank page error, apparently prevents a memory exausted condition.
Error source:
http://wordpress.org/support/topic/blank-page-after-return-form-cielo-buypage?replies=15
Some info:
http://stackoverflow.com/questions/8379829/domdocument-php-memory-leak
Another people using the same code: http://nathanstaines.com/articles/wordpress-word-count/
Cheers,
Gabriel
2013-09-14 00:42:03 -03:00
Mike Jolley
edbe9b5fa2
Redirect to myaccount. Closes #3740
...
@coenjacobs .15
2013-09-13 16:37:26 +01:00
Mike Jolley
9590a03e2f
Fix tax rule detection. Closes #3698 .
...
@coenjacobs .15
2013-09-13 16:34:41 +01:00
Mike Jolley
5f741819b9
Merge pull request #3757 from ragulka/address-hooks
...
Allow using custom address types
2013-09-13 08:03:55 -07:00
Mike Jolley
d13ec3bcd6
touchstart event for ios devices. Closes #3376 .
...
@coenjacobs might be good for .15
2013-09-13 15:48:23 +01:00
Mike Jolley
5b2ed3f243
Fix search_post_excerpt when quotes are searched. Closes #3767
...
@coenjacobs for .15 too
2013-09-13 15:14:19 +01:00
Mike Jolley
f0d255ac9c
Remove private methods from session handler. Closes #3759
2013-09-13 13:39:46 +01:00
Mike Jolley
759e74c860
Safari doesn't support the 'download' attribute. At least get it to open. Closes #3754
2013-09-13 13:38:36 +01:00
Mike Jolley
9f323af118
Fix paging total closes #3774
2013-09-13 12:28:20 +01:00
Mike Jolley
34478b3faf
Merge pull request #3756 from ragulka/download-hooks
...
Add product download access grant/revoke hooks.
2013-09-13 04:20:56 -07:00
Mike Jolley
153e1dbfc3
Merge pull request #3777 from jfarsen/french-jfa
...
French translation corrections
2013-09-13 04:11:35 -07:00
Mike Jolley
e90efe1c28
Merge pull request #3776 from crazyscience/patch-1
...
Removed 'widget_text' from array of force_ssl filtered objects.
2013-09-13 04:11:11 -07:00
Mike Jolley
7cf3c67c76
Wrapper for wp_get_post_terms to handle parent sorting. Closes #3762 . Closes #3758
...
@coenjacobs for .15
2013-09-13 12:07:58 +01:00
Mike Jolley
9e30ebbaa9
Merge pull request #3741 from ragulka/security-improvements
...
Frontend security improvements
2013-09-13 03:33:09 -07:00
Mike Jolley
7e01086ad3
Merge pull request #3679 from dimitrov-adrian/patch-6
...
Adding support for percentage factor of additional costs.
2013-09-13 03:20:17 -07:00