forked from react-bootstrap/react-bootstrap
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[changed]
NavItem
prop type title
to React.PropTypes.node
Merge branch 'master' into pr391 Conflicts: src/NavItem.js
- Loading branch information
Showing
304 changed files
with
6,134 additions
and
28,292 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--ignore-dir=lib | ||
--ignore-dir=amd | ||
--ignore-dir=docs/assets | ||
--ignore-dir=test-built | ||
--ignore-file=match:test_bundle.js | ||
--ignore-file=match:components.html |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# EditorConfig is awesome: http://EditorConfig.org | ||
|
||
# top-most EditorConfig file | ||
root = true | ||
|
||
# Unix-style newlines with a newline ending every file | ||
[*] | ||
end_of_line = lf | ||
insert_final_newline = true | ||
|
||
[*.js] | ||
charset = utf-8 | ||
indent_style = space | ||
indent_size = 2 | ||
|
||
[{package.json,.travis.yml}] | ||
indent_style = space | ||
indent_size = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"env": { | ||
"browser": true, | ||
"node": true | ||
}, | ||
"ecmaFeatures": { | ||
"jsx": true | ||
}, | ||
"parser": "babel-eslint", | ||
"plugins": [ | ||
"react" | ||
], | ||
"rules": { | ||
"comma-spacing": 1, | ||
"key-spacing": 0, | ||
"no-underscore-dangle": 0, | ||
"no-unused-vars": [1, { "vars": "all", "args": "none" }], | ||
"no-undef": 1, | ||
"no-var": 2, | ||
"quotes": [1, "single", "avoid-escape"], | ||
"react/display-name": 0, | ||
"react/jsx-uses-react": 1, | ||
"react/no-did-mount-set-state": 1, | ||
"react/no-did-update-set-state": 1, | ||
"react/no-multi-comp": 1, | ||
"react/prop-types": 1, | ||
"react/react-in-jsx-scope": 1, | ||
"react/self-closing-comp": 1, | ||
"react/wrap-multilines": 1, | ||
"strict": 0 | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,14 @@ | ||
*~ | ||
node_modules | ||
.DS_Store | ||
npm-debug.log | ||
test_bundle.js | ||
test-built/* | ||
.idea | ||
transpiled/* | ||
docs/*.html | ||
docs/assets/bundle.js | ||
cjs/* | ||
amd/* | ||
node_modules | ||
amd/ | ||
!tools/amd/ | ||
lib/ | ||
!tools/lib/ | ||
dist/ | ||
!tools/dist/ | ||
docs-built/ | ||
ie8/bundle.js | ||
lib/* | ||
tmp-bower-repo/ | ||
tmp-docs-repo/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
node_modules/ | ||
docs/ | ||
docs-built/ | ||
test-built/ | ||
test/ | ||
tools/ | ||
.gitignore | ||
.travis.yml | ||
Gruntfile.js | ||
karma.ci.js | ||
karma.dev.js | ||
test_bundle.js | ||
karma.conf.js | ||
tmp-docs-repo/ | ||
tmp-bower-repo/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
sudo: false | ||
language: node_js | ||
node_js: | ||
- "0.10" | ||
- "0.10" | ||
- "0.12" | ||
- "iojs" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.