Commit Graph

12832 Commits

Author SHA1 Message Date
Brent Shepherd a826330ad0 Reinstate default value for $items
That was (accidentally?) removed with SHA: 877e39064

Fixes "PHP Notice:  Undefined variable: items" when attempting to get
line items of a type that does not exist on the order, like coupons.
2015-08-07 12:12:08 -07:00
Claudio Sanches 8bc5e9e284 Merge pull request #8747 from thenbrent/add_api_permissions_filter
Add permissions in scope filter
2015-08-07 15:25:00 -03:00
Brent Shepherd 1681b0f9d5 Add permissions in scope filter
To allow extensions to display the permissions API keys will provide
for their objects, in addition to the permissions for core WC objects.
2015-08-07 11:19:21 -07:00
Claudio Sanches e9acb4f7cf Fixed api keys migration for 2.4, closes #8746 2015-08-07 15:15:34 -03:00
Mike Jolley 6bf6a5df3f Merge pull request #8745 from douglsmith/patch-1
Minor grammar fixes to the 2.4 update welcome message
2015-08-07 17:30:16 +01:00
Doug Smith 46536b6374 Minor grammar fixes to the update welcome message 2015-08-07 11:21:49 -05:00
James Koster b6c7f14a7b fixes broken extension links 2015-08-07 16:03:45 +01:00
Claudio Sanches 9bc3937689 Updated POT 2015-08-07 10:37:55 -03:00
Claudio Sanches 0a657fdd96 Added missing dot 2015-08-07 10:37:45 -03:00
Claudio Sanches 38aa17b67b Fixed hardcoded string 2015-08-07 10:27:40 -03:00
Claudio Sanches e901114c23 Updated POT 2015-08-07 10:19:08 -03:00
Claudio Sanches c0179c8bb2 Fixed a typo/extra end of line 2015-08-07 10:18:30 -03:00
Mike Jolley 877e390646 Remove $type from prepare 2015-08-07 14:06:19 +01:00
Mike Jolley d6ceec0817 Flip esc_like and esc_sql, add % 2015-08-07 13:54:50 +01:00
Mike Jolley 800ae12552 Merge pull request #8742 from thenbrent/fix_truncated_key
Fix truncated_key value inserted on visual authentication request
2015-08-07 11:45:40 +01:00
Mike Jolley 5c9ac6a893 Avoid double escape when passing in arrays to sql queries. Use esc_sql 2015-08-07 11:37:19 +01:00
Mike Jolley c5cba283ed Remove numbered arguments from queries 2015-08-07 11:37:19 +01:00
Mike Jolley fcbdd35223 Clean and escape API search 2015-08-07 11:37:19 +01:00
Mike Jolley 4c8ef3ff33 Use esc_sql on item type instead of esc_attr 2015-08-07 11:37:19 +01:00
Brent Shepherd 19a91e3afc Fix truncated_key value inserted on visual auth
When inserting a new set of API keys via the visual API endpoint, only 5 format
values were specified in the 3rd param passed to the $wpdb->insert(); however,
6 values were specified in the 2nd param. This meant that the truncted_key value
was being formatted as an integer only the first numerical characters of the last
7 character of the consumer key were being stored. For example, given a consumer
key value of ck_e91f2aeae6c3dea3045293a3dbdf55c317ad762c the truncated_key value
should be 7ad762c but instead, it was being stored at 7.
2015-08-06 17:40:17 -07:00
Nicola Mustone 372d1da118 added new issue link 2015-08-06 18:15:55 +02:00
Nicola Mustone 9d32709f0a typo 2015-08-06 18:09:02 +02:00
Marina Pape 830f93250d Revised copy for 'Description' tab
Warren, Nicole and I have worked on a revised blurb for the description page. It was mostly Nicole, I just did some little tweaks.

Copy in this doc: https://docs.google.com/document/d/1NhaPzGg9I_Esf3N_YqH7ox9s0PiEilEgni_a4DlGqpw/edit

I have edited the existing 'description' as per the google doc, and then added links (as there were none in the doc) for the various extensions mentioned, and a couple of other things that made sense to have links.

Over to you :)
2015-08-06 16:13:33 +01:00
Claudio Sanches c6444c1214 Merge pull request #8737 from SiR-DanieL/master
Contribute to WooCommerce page improvement
2015-08-06 09:25:48 -03:00
Nicola Mustone 3ae67c9cd9 Merge pull request #1 from MarinaWoo/patch-1
Typos, phrasing and grammar edits
2015-08-06 14:12:43 +02:00
Marina Pape d031e97e23 Typos, phrasing and grammar edits
As requested by Nicola, went through and made some edits so standardise grammar / flow etc.
2015-08-06 13:06:00 +01:00
Mike Jolley ddd97b64c3 Remove white space to fix appearance of new rows
Fixes #8730
2015-08-06 11:38:46 +01:00
Mike Jolley b91ccd32b9 Tweak wildcard tax handling to deal with 9 digit zip codes
Fixes #8736
2015-08-06 11:36:02 +01:00
Claudio Sanches 2462fc95d4 Merge pull request #8733 from shivapoudel/escape
Fix - calls for esc_*
2015-08-05 17:31:53 -03:00
Shiva Poudel 0d1c2dc4dc Fix - calls for esc_* 2015-08-06 02:04:21 +05:45
Claudio Sanches cd306393b3 Merge pull request #8732 from woothemes/add/more_esc_attrs
More esc_attrs -- continuation of #8731
2015-08-05 16:54:34 -03:00
Claudio Sanches 5e91d27b66 Minify 2015-08-05 16:52:54 -03:00
Claudio Sanches 6726fd642c Updated grunt dependencies 2015-08-05 16:52:03 -03:00
George Stephanis 9269fd7432 Retooling how this is escaped.
Sanitize early, escape late.  Rather than double escaping, I figured
it’d be better to sprintf it in, and then escape that string — closer
to the output.

Also, I’m not sure why `urlencode` was used to escape a name?
2015-08-05 15:18:47 -04:00
George Stephanis c938fa24da More missing esc_attr calls, :( 2015-08-05 15:17:52 -04:00
Claudio Sanches b091f12393 Fixed some js conding standards 2015-08-05 15:57:15 -03:00
Claudio Sanches 1a2ccd741b Merge pull request #8731 from woothemes/add/esc_attr_e
When echoing translations in an attribute, escape them properly.
2015-08-05 15:55:28 -03:00
George Stephanis 83058779b3 Merge remote-tracking branch 'origin/add/esc_attr_e' into add/esc_attr_e
Conflicts:
	includes/admin/settings/views/html-keys-edit.php
2015-08-05 14:17:18 -04:00
George Stephanis 95e6b84fbb Make sure we esc_attr translation results
Part 2 of … 2, I think.
2015-08-05 14:15:00 -04:00
George Stephanis 29d9a7da8c Found two missing `esc_js()` calls as well. 2015-08-05 14:10:10 -04:00
George Stephanis c7ee929325 Partial _e() => esc_attr_e() changeover.
There’s a lot of them, so I’m breaking them into multiple commits.

This is safeguarding stuff in case some translation uses a double
quote, it will no longer risk breaking out of the attribute.
2015-08-05 14:10:09 -04:00
George Stephanis 883ad9003a Make sure we esc_attr translation results
Part 2 of … 2, I think.
2015-08-05 14:08:15 -04:00
Claudio Sanches 47492fb273 Merge branch 'master' of github.com:woothemes/woocommerce 2015-08-05 15:03:05 -03:00
Claudio Sanches 054dfe0c7b Changed default Underscore's template for wp.template in API Keys 2015-08-05 15:02:55 -03:00
George Stephanis aed0b0e891 Found two missing `esc_js()` calls as well. 2015-08-05 12:52:11 -04:00
George Stephanis ecd503ec2c Partial _e() => esc_attr_e() changeover.
There’s a lot of them, so I’m breaking them into multiple commits.

This is safeguarding stuff in case some translation uses a double
quote, it will no longer risk breaking out of the attribute.
2015-08-05 12:51:44 -04:00
Mike Jolley 7f3c2a78c5 Get total functions should respect rounding settings.
Closes #8707
2015-08-05 14:33:53 +01:00
Mike Jolley 737769174e Customer class using wrong meta keys for address_1/shipping_address_1
Fixes #8717
2015-08-05 14:05:03 +01:00
Mike Jolley e8ea978e9e Merge pull request #8697 from JeroenSormani/define-ajax
Define DOING_AJAX early
2015-08-05 13:53:40 +01:00
Mike Jolley afd0e9edd4 Pass $this to filters
#8722
2015-08-05 13:49:27 +01:00