Skip to content

Commit

Permalink
Merge pull request #24 from boybundit/develop
Browse files Browse the repository at this point in the history
1.4.0
  • Loading branch information
boybundit authored Jan 28, 2018
2 parents bc69d82 + a916cb0 commit c60a45f
Show file tree
Hide file tree
Showing 14 changed files with 1,060 additions and 650 deletions.
36 changes: 13 additions & 23 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
{
"extends": "airbnb",
"plugins": [
"react",
"jsx-a11y",
"import"
],
"env": {
"node": true,
"mocha": true
},
"rules": {
"linebreak-style": [0, "windows"],
"no-tabs": [0],
"indent": [2, "tab", { "SwitchCase": 1 }],
"comma-dangle": [0],
"prefer-arrow-callback": [0],
"func-names": [0],
"prefer-template": [0],
"no-param-reassign": [2, { "props": false }],
"object-shorthand" : [0],
"strict": [0, "safe"],
"consistent-return": [0]
}
"extends": "eslint:recommended",
"parserOptions": { "ecmaVersion": 6 },
"env": {
"es6": true,
"node": true,
"mocha": true
},
"rules": {
"indent": ["error", 2, { "SwitchCase": 1 }],
"quotes": ["error", "single"],
"semi": ["error", "always"],
"no-console": "off"
}
}
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
language: node_js
node_js:
- "node"
- "8"
- "6"
- "4"
Loading

0 comments on commit c60a45f

Please sign in to comment.