Skip to content
This repository was archived by the owner on May 13, 2026. It is now read-only.

Commit 9a9d853

Browse files
committed
[changed] NavItem prop type title to React.PropTypes.node
Merge branch 'master' into pr391 Conflicts: src/NavItem.js
2 parents efecfb3 + fda00ca commit 9a9d853

304 files changed

Lines changed: 6134 additions & 28292 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ackrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
--ignore-dir=lib
2+
--ignore-dir=amd
3+
--ignore-dir=docs/assets
4+
--ignore-dir=test-built
5+
--ignore-file=match:test_bundle.js
6+
--ignore-file=match:components.html

.editorconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
11+
[*.js]
12+
charset = utf-8
13+
indent_style = space
14+
indent_size = 2
15+
16+
[{package.json,.travis.yml}]
17+
indent_style = space
18+
indent_size = 2

.eslintrc

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"node": true
5+
},
6+
"ecmaFeatures": {
7+
"jsx": true
8+
},
9+
"parser": "babel-eslint",
10+
"plugins": [
11+
"react"
12+
],
13+
"rules": {
14+
"comma-spacing": 1,
15+
"key-spacing": 0,
16+
"no-underscore-dangle": 0,
17+
"no-unused-vars": [1, { "vars": "all", "args": "none" }],
18+
"no-undef": 1,
19+
"no-var": 2,
20+
"quotes": [1, "single", "avoid-escape"],
21+
"react/display-name": 0,
22+
"react/jsx-uses-react": 1,
23+
"react/no-did-mount-set-state": 1,
24+
"react/no-did-update-set-state": 1,
25+
"react/no-multi-comp": 1,
26+
"react/prop-types": 1,
27+
"react/react-in-jsx-scope": 1,
28+
"react/self-closing-comp": 1,
29+
"react/wrap-multilines": 1,
30+
"strict": 0
31+
}
32+
}

.gitignore

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
*~
2-
node_modules
32
.DS_Store
43
npm-debug.log
5-
test_bundle.js
6-
test-built/*
7-
.idea
8-
transpiled/*
9-
docs/*.html
10-
docs/assets/bundle.js
11-
cjs/*
12-
amd/*
4+
node_modules
5+
amd/
6+
!tools/amd/
7+
lib/
8+
!tools/lib/
9+
dist/
10+
!tools/dist/
11+
docs-built/
1312
ie8/bundle.js
14-
lib/*
1513
tmp-bower-repo/
1614
tmp-docs-repo/

.jshintrc

Lines changed: 0 additions & 15 deletions
This file was deleted.

.npmignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
node_modules/
22
docs/
3+
docs-built/
34
test-built/
45
test/
56
tools/
67
.gitignore
78
.travis.yml
8-
Gruntfile.js
9-
karma.ci.js
10-
karma.dev.js
11-
test_bundle.js
9+
karma.conf.js
10+
tmp-docs-repo/
11+
tmp-bower-repo/

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
sudo: false
12
language: node_js
23
node_js:
3-
- "0.10"
4+
- "0.10"
5+
- "0.12"
6+
- "iojs"

CHANGELOG.md

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
v0.19.1 - Thu, 26 Mar 2015 19:37:01 GMT
2+
---------------------------------------
3+
4+
- [2b7d235](../../commit/2b7d235) [fixed] Re-added CollapsableNav to public API
5+
6+
7+
v0.19.0 - Wed, 25 Mar 2015 21:25:57 GMT
8+
---------------------------------------
9+
10+
- [98ee978](../../commit/98ee978) [changed] Source to ES6 using Babel and Webpack
11+
12+
13+
v0.18.0 - Tue, 24 Mar 2015 02:56:15 GMT
14+
---------------------------------------
15+
16+
- [728c2b0](../../commit/728c2b0) [fixed] docs CodeMirror scroll height too big
17+
- [d282621](../../commit/d282621) [fixed] Split buttons with React 0.13
18+
- [549da6e](../../commit/549da6e) [added] react-router dependency for docs
19+
- [804c24a](../../commit/804c24a) [added] Support for React 0.13.x
20+
- [4c26075](../../commit/4c26075) [fixed] Build status badge
21+
- [70f8596](../../commit/70f8596) [added] Travis CI Optimization
22+
23+
24+
v0.17.0 - Tue, 17 Mar 2015 15:03:27 GMT
25+
---------------------------------------
26+
27+
- [4fae871](../../commit/4fae871) [added] CollapsableNav implements bootstrap markup for navbar-collapse
28+
- [befed83](../../commit/befed83) [fixed] All panel-* classes dynamic based on bsStyle prop
29+
- [de6f7dd](../../commit/de6f7dd) [fixed] CollapsableMixin fixed size
30+
- [7cc4747](../../commit/7cc4747) [fixed] Added role="button" to NavItem for aria compliance.
31+
- [3b6ba7a](../../commit/3b6ba7a) [fixed] Col Offset/Pull/Push of zero. Fixes #406
32+
- [66c439f](../../commit/66c439f) [fixed] OverlayTrigger improvement related to #353 . Helps reduce browser reflows for lots of multiple OverlayTriggers being rendered at once. Before: http://i.imgur.com/e4UZ5l6.png , http://i.imgur.com/Tw39F9t.png After: http://i.imgur.com/bU0f7VY.png
33+
34+
35+
v0.16.1 - Tue, 03 Mar 2015 23:04:19 GMT
36+
---------------------------------------
37+
38+
- [71ff264](../../commit/71ff264) [added] bsSize prop to Input, supporting input groups
39+
40+
41+
v0.16.0 - Fri, 27 Feb 2015 14:01:37 GMT
42+
---------------------------------------
43+
44+
- [25b4143](../../commit/25b4143) [fixed] Define toggleNavKey in the propTypes
45+
- [1a4ae1d](../../commit/1a4ae1d) [fixed] Fix rendering Navbar header when toggleNavKey is 0
46+
- [13f395d](../../commit/13f395d) [added] bsStyle prop support for Modal to set the header color
47+
- [c822837](../../commit/c822837) [removed] non-standard onClick props for ListGroup and ListGroupItem
48+
- [1556e63](../../commit/1556e63) [added] Example for collapsable Navbar in docs.
49+
50+
151
v0.15.1 - Tue, 17 Feb 2015 14:30:54 GMT
252
---------------------------------------
353

@@ -9,4 +59,4 @@ v0.15.0 - Mon, 16 Feb 2015 02:41:59 GMT
959

1060
- [1ef51cb](../../commit/1ef51cb) [added] Changelog generation from commit messages
1161
- [13baeaa](../../commit/13baeaa) [added] Release task to push and tag docs and bower repos
12-
- [0193046](../../commit/0193046) [changed] Move built components to lib directory
62+
- [0193046](../../commit/0193046) [changed] Move built components to lib directory

CONTRIBUTING.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,27 @@
33
We welcome community support with both pull requests and reporting bugs. Please
44
don't hesitate to jump in.
55

6+
## Current Issues
7+
8+
Feel free to tackle any currently open
9+
[issue](https://github.com/react-bootstrap/react-bootstrap/issues). The issues
10+
tagged with "help wanted" are especially open.
11+
612
## Tests
713

814
All commits that fix bugs or add features need a test.
915

16+
## Code Style
17+
18+
Please adhere to the current code styling. We have included an `.editorconfig`
19+
at the repo's root to facilitate uniformity regardless of your editor. See the
20+
[editor config site](http://editorconfig.org/) for integration details.
21+
22+
We use [ESLint](http://eslint.org/) for all JavaScript Linting. There should be
23+
no linting errors and no new warnings for new work. You are welcome to configure
24+
your editor to use ESLint or the `npm test` command will run unit tests and the
25+
linter.
26+
1027
## Commit Subjects for Public API Changes
1128

1229
If your patch **changes the API or fixes a bug** please use one of the following

0 commit comments

Comments
 (0)