Skip to content

Commit

Permalink
Merge ceec04f into d326476
Browse files Browse the repository at this point in the history
  • Loading branch information
troch committed Oct 19, 2015
2 parents d326476 + ceec04f commit 8fc2881
Show file tree
Hide file tree
Showing 31 changed files with 808 additions and 1,951 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"quotes": [2, "single", "avoid-escape"],
"no-underscore-dangle": 0,
"no-unneeded-ternary": 2,
"semi": 0,
"semi": 2,
// ES6
"no-var": 2,
"no-this-before-super": 2,
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/node_modules
/dist/test
/dist
/temp
/coverage
saucelabs.js
npm-debug.log
6 changes: 5 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
/node_modules
/dist/test
/coverage
/tests
npm-debug.log
karma.config.js
.travis.yml
README.md
bower.json
gulpfile.js
saucelabs.js
CHANGELOG.md
.editorconfig
.eslintrc
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ before_script:
script:
- npm run lint
- npm run build
- npm run buildTest
- npm run test
# - npm run test-sauce
after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
Expand Down

0 comments on commit 8fc2881

Please sign in to comment.