Commit Graph

17471 Commits

Author SHA1 Message Date
corsonr f5bc298bae Merge branch 'master' into issue_11801
solve branch sync issue
2016-08-30 14:57:22 +02:00
corsonr 2967b7763b Merge remote-tracking branch 'upstream/master'
fix branch sync issue
2016-08-30 14:48:03 +02:00
corsonr 18b1fe5c2c branch sync fix 2016-08-30 14:47:54 +02:00
corsonr 81ead1d282 sync branch fix 2016-08-30 14:46:08 +02:00
Mike Jolley 6fad572eb7 Attempt to stop travis error
cc @gedex
2016-08-30 13:37:39 +01:00
corsonr 512fea5841 Merge branch 'corsonr-issue_11801'
sync branch fix
2016-08-30 14:34:46 +02:00
corsonr 94eee2e6ee branch sync fix 2016-08-30 14:34:03 +02:00
corsonr 8cb17c1923 branch conflict fix 2016-08-30 14:30:05 +02:00
Mike Jolley c4c863ffb0 Merge pull request #11792 from WPprodigy/price-filter-fix
Cast as decimal when querying prices
2016-08-30 11:48:51 +01:00
Mike Jolley 499e190efb Merge pull request #11785 from woothemes/coupon-exceptions
Coupon Exceptions and REST/CRUD improvements
2016-08-30 11:44:19 +01:00
Mike Jolley df35845d4d wc_get_coupon_id_by_code 2016-08-30 11:43:53 +01:00
Claudio Sanches f54ada22ba Merge pull request #11796 from webmandesign/patch-1
Making sure `wc_get_screen_ids` function exists
2016-08-29 14:48:06 -03:00
Claudio Sanches 81dd58e7c1 Merge pull request #11805 from woothemes/fix/misc-api-issues
Add some missing API pieces (settings & shipping zone endpoints)
2016-08-29 14:25:38 -03:00
Justin Shreve de4296dd15 Add some missing API pieces:
* Value was missing from the settings schema (but was still present in the response).
* Added delete endpoint for shipping zones.
* Corrected permissions check/error for shipping zone methods.
2016-08-29 10:22:29 -07:00
corsonr f369600b1d Fixes #11801 2016-08-29 14:51:13 +02:00
Aristeides Stathopoulos d2d41437f8 Add exception for Generic.PHP.DeprecatedFunctions.Deprecated 2016-08-27 20:52:31 +03:00
Aristeides Stathopoulos cdf70bb953 don't run phpcs on the vendor folder. 2016-08-27 20:06:32 +03:00
Aristeides Stathopoulos 9bf8eb861c indentation 2016-08-27 19:53:46 +03:00
Aristeides Stathopoulos 7aa3a0fc9e move scripts 2016-08-27 19:52:45 +03:00
Oliver Juhas 9a0c283b10 Making sure `wc_get_screen_ids` function exists
This is a fix for issue #11795
2016-08-27 16:46:23 +02:00
Aristeides Stathopoulos 08250b9339 exclude vendor folder 2016-08-27 17:35:11 +03:00
Aristeides Stathopoulos c0b43e6370 attempt to run PHPCS on travis 2016-08-27 17:18:14 +03:00
Aristeides Stathopoulos 69e6b05205 typo fix 2016-08-27 17:10:12 +03:00
Aristeides Stathopoulos 1c2a67554b fix typo 2016-08-27 16:56:21 +03:00
Aristeides Stathopoulos 3267ce6522 WordPress.WhiteSpace.OperatorSpacing.SpacingBefore 2016-08-27 09:16:28 +03:00
Aristeides Stathopoulos 72696901f3 WordPress.WhiteSpace.OperatorSpacing.SpacingAfter 2016-08-27 09:14:06 +03:00
Aristeides Stathopoulos fb62d280b5 WordPress.WhiteSpace.OperatorSpacing.NoSpaceBefore 2016-08-27 09:07:42 +03:00
Aristeides Stathopoulos e69fafbda7 WordPress.WhiteSpace.OperatorSpacing.NoSpaceAfter 2016-08-27 09:06:22 +03:00
Caleb Burks 417d707996 Cast as decimal when querying prices 2016-08-27 01:03:06 -05:00
Aristeides Stathopoulos f2730eea02 WordPress.WhiteSpace.ControlStructureSpacing.BlankLineAfterEnd 2016-08-27 08:57:05 +03:00
Aristeides Stathopoulos 7c589cf7e1 WordPress.WhiteSpace.ControlStructureSpacing.ExtraSpaceAfterCloseParenthesis 2016-08-27 07:53:52 +03:00
Aristeides Stathopoulos a19848978a WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterCloseParenthesis 2016-08-27 07:47:24 +03:00
Aristeides Stathopoulos dea39df779 WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterOpenParenthesis 2016-08-27 07:38:29 +03:00
Aristeides Stathopoulos 2101dae5a0 WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterStructureOpen 2016-08-27 07:35:04 +03:00
Aristeides Stathopoulos dcd5495af9 WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBetweenStructureColon 2016-08-27 07:32:21 +03:00
Aristeides Stathopoulos 9543c7fe1c WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeCloseParenthesis 2016-08-27 07:29:49 +03:00
Aristeides Stathopoulos 82f3cc221e WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeOpenParenthesis 2016-08-27 07:23:02 +03:00
Aristeides Stathopoulos 4e3c1fd865 WordPress.WhiteSpace.ControlStructureSpacing.OpenBraceNotSameLine 2016-08-27 07:09:12 +03:00
Aristeides Stathopoulos 538f8e02cc WordPress.WhiteSpace.ControlStructureSpacing.SpaceBeforeFunctionOpenParenthesis 2016-08-27 07:06:25 +03:00
Aristeides Stathopoulos d430dabb37 Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines 2016-08-27 07:04:18 +03:00
Aristeides Stathopoulos 741f2b954a Squiz.WhiteSpace.SuperfluousWhitespace.EndLine 2016-08-27 07:01:22 +03:00
Aristeides Stathopoulos 56fd004a72 WordPress.Arrays.ArrayDeclaration.FirstIndexNoNewline 2016-08-27 06:56:09 +03:00
Aristeides Stathopoulos 55075ce3a4 WordPress.Arrays.ArrayDeclaration.IndexNoNewline 2016-08-27 06:35:20 +03:00
Aristeides Stathopoulos 6c30f84fa2 WordPress.Arrays.ArrayKeySpacingRestrictions.SpacesAroundArrayKeys 2016-08-27 06:23:21 +03:00
Aristeides Stathopoulos ff852038c9 WordPress.Arrays.ArrayKeySpacingRestrictions.NoSpacesAroundArrayKeys 2016-08-27 06:11:30 +03:00
Aristeides Stathopoulos 17961f6484 WordPress.Arrays.ArrayDeclaration.ValueNoNewline 2016-08-27 06:04:10 +03:00
Aristeides Stathopoulos 478a914494 WordPress.Arrays.ArrayDeclaration.SpaceInEmptyArray 2016-08-27 05:48:53 +03:00
Aristeides Stathopoulos 72ee94d11b WordPress.Arrays.ArrayDeclaration.SpaceBeforeComma 2016-08-27 05:46:40 +03:00
Aristeides Stathopoulos 730069db06 WordPress.Arrays.ArrayDeclaration.SpaceAfterKeyword 2016-08-27 05:39:16 +03:00
Aristeides Stathopoulos 0b0f67ad28 WordPress.Arrays.ArrayDeclaration.SpaceAfterDoubleArrow 2016-08-27 05:36:32 +03:00