Skip to content

Commit

Permalink
Merge pull request #68 from lognormal/soasta-2015
Browse files Browse the repository at this point in the history
SOASTA 2015 Contributions
  • Loading branch information
nicjansma committed Feb 29, 2016
2 parents e6b10b5 + 009c897 commit 44b4d62
Show file tree
Hide file tree
Showing 225 changed files with 13,133 additions and 8,772 deletions.
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[*]
end_of_line = lf
insert_final_newline = true

[*.js]
indent_style = tab
23 changes: 20 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
{
"env": {
"browser": true
"browser":true
},
"plugins": [
"html"
],
"globals": {
"BOOMR":true,
"BOOMR_start":true,
"BOOMR_lstart":true,
"BOOMR_onload":true,
"BOOMR_test":true,
"console":false,
"unescape":false,
"BOOMR_configt":true
"BOOMR_configt":true,
"BOOMR_check_doc_domain":true
},
"rules": {
"no-mixed-spaces-and-tabs":[2, true],
Expand All @@ -20,6 +26,17 @@
"space-infix-ops":0,
"no-console":0,
"no-delete-var":0,
"no-underscore-dangle":0
"no-underscore-dangle":0,
"no-multi-spaces":0,
"dot-notation":[2, {"allowKeywords": false}],
"space-unary-ops":0,
"key-spacing":0,
"no-empty":2,
"brace-style": [1, "stroustrup", { "allowSingleLine": true }],
"space-after-keywords": [2, "always"],
"no-space-before-semi": 0,
"indent": [2, "tab"],
"space-before-function-paren": [2, "never"],
"no-trailing-spaces": [2, { skipBlankLines: false }]
}
}
19 changes: 16 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
.gitignore
*.gz
*.swp
boomerang-*.js
node_modules*
/boomerang-*.js
build/*
build/
hint.log
*.log
*.diff
.project
.settings/
tests/vendor/
tests/coverage/
tests/results/*
tests/pages/*
node_modules/
tests/server/env.json
npm-debug.log
/tests/e2e/e2e.json
/tests/e2e/e2e-debug.json
*.#*
*#*
*~
Loading

0 comments on commit 44b4d62

Please sign in to comment.