Skip to content

Commit

Permalink
[changed] NavItem prop type title to React.PropTypes.node
Browse files Browse the repository at this point in the history
Merge branch 'master' into pr391

Conflicts:
	src/NavItem.js
  • Loading branch information
mtscout6 committed Mar 28, 2015
2 parents efecfb3 + fda00ca commit 9a9d853
Show file tree
Hide file tree
Showing 304 changed files with 6,134 additions and 28,292 deletions.
6 changes: 6 additions & 0 deletions .ackrc
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
18 changes: 18 additions & 0 deletions .editorconfig
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
32 changes: 32 additions & 0 deletions .eslintrc
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
}
}
18 changes: 8 additions & 10 deletions .gitignore
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/
15 changes: 0 additions & 15 deletions .jshintrc

This file was deleted.

8 changes: 4 additions & 4 deletions .npmignore
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/
5 changes: 4 additions & 1 deletion .travis.yml
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"
52 changes: 51 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,53 @@
v0.19.1 - Thu, 26 Mar 2015 19:37:01 GMT
---------------------------------------

- [2b7d235](../../commit/2b7d235) [fixed] Re-added CollapsableNav to public API


v0.19.0 - Wed, 25 Mar 2015 21:25:57 GMT
---------------------------------------

- [98ee978](../../commit/98ee978) [changed] Source to ES6 using Babel and Webpack


v0.18.0 - Tue, 24 Mar 2015 02:56:15 GMT
---------------------------------------

- [728c2b0](../../commit/728c2b0) [fixed] docs CodeMirror scroll height too big
- [d282621](../../commit/d282621) [fixed] Split buttons with React 0.13
- [549da6e](../../commit/549da6e) [added] react-router dependency for docs
- [804c24a](../../commit/804c24a) [added] Support for React 0.13.x
- [4c26075](../../commit/4c26075) [fixed] Build status badge
- [70f8596](../../commit/70f8596) [added] Travis CI Optimization


v0.17.0 - Tue, 17 Mar 2015 15:03:27 GMT
---------------------------------------

- [4fae871](../../commit/4fae871) [added] CollapsableNav implements bootstrap markup for navbar-collapse
- [befed83](../../commit/befed83) [fixed] All panel-* classes dynamic based on bsStyle prop
- [de6f7dd](../../commit/de6f7dd) [fixed] CollapsableMixin fixed size
- [7cc4747](../../commit/7cc4747) [fixed] Added role="button" to NavItem for aria compliance.
- [3b6ba7a](../../commit/3b6ba7a) [fixed] Col Offset/Pull/Push of zero. Fixes #406
- [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


v0.16.1 - Tue, 03 Mar 2015 23:04:19 GMT
---------------------------------------

- [71ff264](../../commit/71ff264) [added] bsSize prop to Input, supporting input groups


v0.16.0 - Fri, 27 Feb 2015 14:01:37 GMT
---------------------------------------

- [25b4143](../../commit/25b4143) [fixed] Define toggleNavKey in the propTypes
- [1a4ae1d](../../commit/1a4ae1d) [fixed] Fix rendering Navbar header when toggleNavKey is 0
- [13f395d](../../commit/13f395d) [added] bsStyle prop support for Modal to set the header color
- [c822837](../../commit/c822837) [removed] non-standard onClick props for ListGroup and ListGroupItem
- [1556e63](../../commit/1556e63) [added] Example for collapsable Navbar in docs.


v0.15.1 - Tue, 17 Feb 2015 14:30:54 GMT
---------------------------------------

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

- [1ef51cb](../../commit/1ef51cb) [added] Changelog generation from commit messages
- [13baeaa](../../commit/13baeaa) [added] Release task to push and tag docs and bower repos
- [0193046](../../commit/0193046) [changed] Move built components to lib directory
- [0193046](../../commit/0193046) [changed] Move built components to lib directory
17 changes: 17 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,27 @@
We welcome community support with both pull requests and reporting bugs. Please
don't hesitate to jump in.

## Current Issues

Feel free to tackle any currently open
[issue](https://github.com/react-bootstrap/react-bootstrap/issues). The issues
tagged with "help wanted" are especially open.

## Tests

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

## Code Style

Please adhere to the current code styling. We have included an `.editorconfig`
at the repo's root to facilitate uniformity regardless of your editor. See the
[editor config site](http://editorconfig.org/) for integration details.

We use [ESLint](http://eslint.org/) for all JavaScript Linting. There should be
no linting errors and no new warnings for new work. You are welcome to configure
your editor to use ESLint or the `npm test` command will run unit tests and the
linter.

## Commit Subjects for Public API Changes

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

0 comments on commit 9a9d853

Please sign in to comment.