Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
* development: (27 commits)
  Release 0.15.1 (#1314)
  Fix wrong method hooks context (#1307)
  - function isSoldOut() should return true if quantity is <= 0, not only if it is === 0. (#1311)
  Remove jquery-ui (#1310)
  Taxes (#1289)
  Fix Stripe refunds and Double Discounts (#1304)
  fix refunds and discounts for authorize.net (#1279)
  Fix Braintree discounts and refunds (#1265)
  Allow any user who has the createProduct permission to also delete products (#1263)
  Remove bash script from postinstall to fix Windows installs (#1299)
  update cardNumber schemas
  Fix PayPal PayFlow discounts and refunds (#1275)
  logout and hasPermission updates (#1290)
  Create email job queue and Reaction.Email namespace (#1282)
  updated package.json (#1286)
  Update circle node (#1281)
  Use forked version of authorize.net that doesn't have vulnerability (#1252)
  fix for #1072 (#1247)
  Temporarily bypass failiing inventory test (#1280)
  Fix inventory tests (#1254)
  ...

# Conflicts:
#	.codeclimate.yml
#	.eslintignore
#	.meteor/versions
#	client/modules/core/main.js
#	imports/plugins/core/orders/client/templates/workflow/shippingTracking.js
#	imports/plugins/core/taxes/client/settings/custom.js
#	imports/plugins/core/taxes/client/settings/settings.js
#	imports/plugins/core/taxes/server/methods/methods.js
#	imports/plugins/included/authnet/server/methods/authnet.js
#	imports/plugins/included/braintree/server/methods/braintreeApi.js
#	imports/plugins/included/braintree/server/methods/braintreeMethods.js
#	imports/plugins/included/braintree/server/methods/braintreeapi-methods-refund.app-test.js
#	imports/plugins/included/example-paymentmethod/server/methods/example-payment-methods.app-test.js
#	imports/plugins/included/inventory/server/hooks/hooks.js
#	imports/plugins/included/inventory/server/hooks/inventory-hooks.app-test.js
#	imports/plugins/included/inventory/server/methods/inventory.js
#	imports/plugins/included/inventory/server/methods/statusChanges.js
#	imports/plugins/included/launchdock-connect/client/templates/dashboard.js
#	imports/plugins/included/paypal/server/methods/payflowpro-methods-refund.app-test.js
#	imports/plugins/included/paypal/server/methods/payflowproApi.js
#	imports/plugins/included/paypal/server/methods/payflowproMethods.js
#	imports/plugins/included/product-variant/client/templates/products/productDetail/variants/variantForm/variantForm.js
#	imports/plugins/included/taxes-avalara/server/hooks/hooks.js
#	imports/plugins/included/taxes-taxcloud/server/hooks/hooks.js
#	imports/plugins/included/taxes-taxjar/server/hooks/hooks.js
#	lib/collections/helpers.js
#	package.json
#	server/api/core/import.js
#	server/methods/catalog.js
#	server/methods/core/cart-remove.app-test.js
#	server/methods/core/orders.js
#	server/methods/core/shop.js
  • Loading branch information
jshimko committed Aug 23, 2016
2 parents cc13cef + 34339b7 commit 889687a
Show file tree
Hide file tree
Showing 189 changed files with 1,770 additions and 2,682 deletions.
76 changes: 76 additions & 0 deletions .bithoundrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"ignore": [
"**/deps/**",
"**/node_modules/**",
"**/thirdparty/**",
"**/third_party/**",
"**/vendor/**",
"**/**-min-**",
"**/**-min.**",
"**/**.min.**",
"**/**jquery.?(ui|effects)-*.*.?(*).?(cs|j)s",
"**/**jquery-*.*.?(*).?(cs|j)s",
"**/prototype?(*).js",
"**/mootools*.*.*.js",
"**/dojo.js",
"**/MochiKit.js",
"**/yahoo-*.js",
"**/yui*.js",
"**/ckeditor*.js",
"**/tiny_mce*.js",
"**/tiny_mce/?(langs|plugins|themes|utils)/**",
"**/MathJax/**",
"**/shBrush*.js",
"**/shCore.js",
"**/shLegacy.js",
"**/modernizr.custom.?(*).js",
"**/knockout-*.*.*.debug.js",
"**/extjs/*.js",
"**/extjs/*.xml",
"**/extjs/*.txt",
"**/extjs/*.html",
"**/extjs/*.properties",
"**/extjs/.sencha",
"**/extjs/docs/**",
"**/extjs/builds/**",
"**/extjs/cmd/**",
"**/extjs/examples/**",
"**/extjs/locale/**",
"**/extjs/packages/**",
"**/extjs/plugins/**",
"**/extjs/resources/**",
"**/extjs/src/**",
"**/extjs/welcome/**",
"bower_components/**"
],
"test": [
"**/test/**",
"**/tests/**",
"**/spec/**",
"**/specs/**",
"**/**.app-test.**"
],
"critics": {
"wc": {"limit": 5000},
"lint": {"engine": "eslint"}
},
"dependencies": {
"mute": [
"wdio-mocha-framework"
],
"unused-ignores": [
"jquery",
"sweetalert2",
"font-awesome",
"bcrypt",
"react-addons-pure-render-mixin",
"url",
"griddle-react",
"tether-tooltip",
"react-textarea-autosize",
"react-color",
"react-autosuggest",
"meteor-node-stubs"
]
}
}
7 changes: 3 additions & 4 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ exclude_paths:
- ".codeclimate.yml"
engines:
eslint:
enabled: true
channel: "eslint-2"
enabled: false
csslint:
enabled: false
duplication:
enabled: true
enabled: false
config:
languages:
javascript:
mass_threshold: 150
fixme:
enabled: true
enabled: false
config:
strings:
- FIXME
Expand Down
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
# things to ignore in lint

*.min.*
server/plugins.js
client/plugins.js
30 changes: 18 additions & 12 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"parser": "babel-eslint", // for support of spread operator
"parser": "babel-eslint", // now for the support of allowImportExportEverywhere
"env": {
"browser": true,
"node": true,
"es6": true
},
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
"sourceType": "module",
"allowImportExportEverywhere": true
},
"plugins": ["react"],
"ecmaFeatures": {
Expand All @@ -28,14 +29,14 @@
"templateStrings": true,
"jsx": true
},
// NOTE: This is ESLINT v1 syntax because Code Climate v2 seg faults.
// NOTE: We're now using eslint-3
"rules": {
/**
* Strict mode
* babel inserts "use strict"; for us
* http://eslint.org/docs/rules/strict
*/
"strict": [2, "never"],
"strict": 0,

/**
* ES6
Expand Down Expand Up @@ -83,7 +84,7 @@
* JSX / React
*/
"jsx-quotes": [2, "prefer-double"], // http://eslint.org/docs/rules/jsx-quotes
/*"react/no-deprecated": 1,*/
"react/no-deprecated": 1,
"react/display-name": 1,
"react/forbid-prop-types": 1,
"react/jsx-boolean-value": [1, "always"],
Expand All @@ -93,11 +94,11 @@
"react/jsx-max-props-per-line": [1, {
"maximum": 4
}],
/*"react/jsx-no-bind": 1,*/
"react/jsx-no-bind": 1,
"react/jsx-no-duplicate-props": 1,
"react/jsx-no-literals": 1,
"react/jsx-no-undef": 1,
"react/jsx-sort-prop-types": 1,
"react/sort-prop-types": 1,
"react/jsx-sort-props": 1,
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
Expand All @@ -111,22 +112,27 @@
"react/prefer-es6-class": 1,
"react/prop-types": 1,
"react/react-in-jsx-scope": 0,
"react/require-extension": 1,
"react/require-extension": "off",
"react/self-closing-comp": 1,
"react/sort-comp": 1,
"react/wrap-multilines": 1,

/**
* Best practices
*/
"consistent-return": 2, // http://eslint.org/docs/rules/consistent-return
"consistent-return": [1, { // http://eslint.org/docs/rules/consistent-return
"treatUndefinedAsUnspecified": false
}],
"curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly
"default-case": 2, // http://eslint.org/docs/rules/default-case
"dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation
"allowKeywords": true
}],
"eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq
"guard-for-in": 2, // http://eslint.org/docs/rules/guard-for-in
"prefer-const": [1, {
"destructuring": "any",
"ignoreReadBeforeAssign": false
}],
"no-caller": 2, // http://eslint.org/docs/rules/no-caller
"no-else-return": 2, // http://eslint.org/docs/rules/no-else-return
"no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null
Expand Down Expand Up @@ -158,11 +164,11 @@
"vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top
"wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife
"yoda": 2, // http://eslint.org/docs/rules/yoda
"max-len": [2, 160, 2, {
"max-len": [1, 160, 2, {
"ignoreComments": true,
"ignoreUrls": true
}], // http://eslint.org/docs/rules/max-len
"valid-jsdoc": 2, // http://eslint.org/docs/rules/valid-jsdoc
"valid-jsdoc": 1, // http://eslint.org/docs/rules/valid-jsdoc
"quote-props": [2, "consistent-as-needed"], // http://eslint.org/docs/rules/quote-props
/**
* Style
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ private/custom/*

imports/plugins/custom/*
!imports/plugins/custom/.gitkeep

.reaction/config.json
1 change: 1 addition & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ notices-for-facebook-graph-api-2
1.3.0-split-minifiers-package
1.3.5-remove-old-dev-bundle-link
1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package
23 changes: 12 additions & 11 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,39 @@
[email protected] # Packages every Meteor app needs to have
[email protected] # Packages for a great mobile UX
[email protected] # Compile .html files into Meteor Blaze views
[email protected].13 # ECMAScript 5 compatibility for older browsers.
[email protected].7 # Enable ECMAScript2015+ syntax in app code
[email protected].14 # ECMAScript 5 compatibility for older browsers.
[email protected].8 # Enable ECMAScript2015+ syntax in app code
[email protected] # ensure meteor method argument validation
[email protected] # security-related policies enforced by newer browsers
juliancwirko:postcss # CSS post-processing plugin (replaces standard-minifier-css)
standard-minifier-js@1.1.8 # a minifier plugin used for Meteor apps by default
standard-minifier-js@1.2.0 # a minifier plugin used for Meteor apps by default
[email protected] # ReactiveDict whose contents are preserved across Hot Code Push
[email protected] # Meteor transparent reactive programming library
[email protected].10
[email protected].11
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].8
[email protected].9
[email protected]
[email protected]
[email protected].14
[email protected].15
[email protected]
[email protected]
[email protected].4
[email protected].16
[email protected].5
[email protected].17
[email protected]
amplify
mdg:validated-method
shell-server

# Meteor Auth Packages
[email protected].9
accounts-password@1.2.12
[email protected].11
accounts-password@1.3.0
[email protected]
[email protected]
[email protected]
oauth-encryption@1.1.13
oauth-encryption@1.2.0
# accounts-github
# accounts-weibo
# accounts-oauth
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[email protected].0.1
[email protected]
Loading

0 comments on commit 889687a

Please sign in to comment.