Merge branch 'master' into react-14

Author: taion

.eslintrc

@@ -15,18 +15,14 @@
   "rules": {
     "constructor-super": 2,
     "comma-dangle": 0,
-    "func-names": 0,
-    "guard-for-in": 0,
+    "eqeqeq": [2, "allow-null"],
+    "id-length": 0,
     "one-var": [2, { "initialized": "never" }],
     "prefer-const": 0,
-    "key-spacing": 0,
-    "no-eq-null": 0,
-    "no-else-return": 0,
     "no-param-reassign": 0,
     "no-this-before-super": 2,
-    "no-undef": 2,
     "babel/object-shorthand": 2,
-    "react/jsx-boolean-value": [2, "never"],
+    "react/jsx-boolean-value": 2,
     "react/jsx-no-duplicate-props": 2,
     "react/prop-types": [2, { "ignore": [ "children", "className", "style" ] }],
     "react/sort-comp": 0

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - "iojs"
+- 4
 cache:
   directories:
     - node_modules

CHANGELOG-alpha.md

@@ -1,3 +1,40 @@
+v0.26.2 - Wed, 07 Oct 2015 16:43:16 GMT
+---------------------------------------
+
+- [ca52c30](../../commit/ca52c30) [fixed] Actually export the Image component
+- [73daba7](../../commit/73daba7) [fixed] Show toggle button when using NavBrand
+
+
+
+v0.26.1 - Mon, 05 Oct 2015 02:04:27 GMT
+---------------------------------------
+
+
+
+
+
+v0.26.0 - Sun, 04 Oct 2015 21:21:22 GMT
+---------------------------------------
+
+- [b7853bb](../../commit/b7853bb) [fixed] Dropdown focus behavior on click
+- [dbb0385](../../commit/dbb0385) [added] #1320 allow NavItem class to be set
+- [3d13dda](../../commit/3d13dda) [fixed] #1287 ListGroupItem with onClick and header properly displays header
+- [3f5c6e3](../../commit/3f5c6e3) [added] #1181 ListGroup supports componentClass prop
+- [b5a9f3a](../../commit/b5a9f3a)     [added] NavBrand Component
+- [ac37698](../../commit/ac37698) [added] 'Responsive embed' component
+- [1c2d054](../../commit/1c2d054) [fixed] Set the disabled css class so that the text is greyed out.
+- [0348274](../../commit/0348274) [fixed] Breadcrumb and BreadcrumbItem components
+- [3c710f9](../../commit/3c710f9) [added] Breadcrumb component
+- [99d333f](../../commit/99d333f) [changed] use `lodash-compat` for IE8 compatibility and `lodash` for dev
+- [ce564cb](../../commit/ce564cb) [fixed] any props not known by DropdownMenu are passed through to the underlying ul
+- [674d67e](../../commit/674d67e) [added] images component
+- [deee09d](../../commit/deee09d) [fixed] stop rendering extra attributes on Progress bar dom nodes
+- [02f1fec](../../commit/02f1fec) [fixed] allow null activeKey (empty) selection
+- [656f40d](../../commit/656f40d) [changed] 'id' prop-type made uniform throughout the project
+- [b9a4477](../../commit/b9a4477) [changed] use 'react-prop-types' instead of 'utils/CustomPropTypes'
+
+
+
 v0.25.2 - Sat, 12 Sep 2015 15:59:13 GMT
 ---------------------------------------
 

CHANGELOG.md

@@ -66,24 +66,39 @@ less active when you don't. If you get a new job and get busy, that's alright.
 
 Releases should include documentation, git tag, bower package preparation and
 finally the actual npm module publish. We have all of this automated by running
-`./tools/release` from the root of the repository. __PLEASE DO NOT RUN `npm
-publish` BY ITSELF__. The release script will do that. We want to prevent issues
+`npm run release`. __PLEASE DO NOT RUN `npm
+publish` BY ITSELF__. The `release-script` will do that. We want to prevent issues
 like [#325](https://github.com/react-bootstrap/react-bootstrap/issues/325) and
 [#218](https://github.com/react-bootstrap/react-bootstrap/issues/218) from ever
-happening again. In order to run the release script you will need permission to
+happening again. In order to run the `release-script` you will need permission to
 publish the package to npm. Those with this permission are in the [publishers
 team](https://github.com/orgs/react-bootstrap/teams/publishers)
 
 *Note: The publishers team does exist. If you see 404 that means you just have no permissions to publish.*
 
-Example usages of the release script:
+Example usages of the `release-script`:
 
 ```bash
-$ ./tools/release patch
-$ ./tools/release minor
-$ ./tools/release major
-$ ./tools/release minor --preid beta   Use both bump and preid for first prerelease
-$ ./tools/release --preid beta         For follow on prereleases of the next version just use this
+$ npm run release patch // without "--run" it will run in "dry run" mode
+$ npm run release patch -- --run
+$ npm run release minor -- --run
+$ npm run release major -- --run
+$ npm run release minor -- --preid beta --run  Use both bump and preid for first prerelease
+$ npm run release -- --preid beta --run        For follow on prereleases of the next version just use this
+```
+
+*Note additional `--` double-dash. It is important.*
+
+Or if you have this line
+```sh
+export PATH="./node_modules/.bin:$PATH"
+```
+in your shell config, then you can run it just as:
+```bash
+$ release patch // without "--run" it will run in "dry run" mode
+$ release patch --run
+$ release minor --preid beta --run
+$ release --preid beta --run
 ```
 
 Note that the above commands will bump the [semver](http://semver.org) version
@@ -127,22 +142,33 @@ To live patch the documentation in between release follow these steps
 0. Create a new branch from there (for example `git checkout -b docs/v0.22.1`)
 0. Cherry-pick the commits you want to include in the live update
 `git cherry-pick <commit-ish>...`
-0. Use the release-docs script to push and tag to the documentation repository.
+0. Use the
+```bash
+$ npm run release -- --only-docs --run
+// or
+$ release --only-docs --run
+```
+to push and tag to the documentation repository.
 
 *Note: The branch name you checkout to cherry-picked the commit is not enforced.
 Though keeping similar names ex: `docs/<version>` helps finding the branch
 easily.*
 
-Example usage of release-docs script:
-
-```bash
-$ ./tools/release-docs
-```
 
 ### Check everything is OK before releasing
 
-Release tools have a very useful option `--dry-run`.
+Release tools are run in "dry run" mode by default.
+It prevents `danger` steps (`git push`, `npm publish` etc) from accidental running.
 
 You can use it
 - to learn how releasing tools are working.
 - to ensure there are no side issues before you release anything.
+```bash
+$ npm run release -- --only-docs
+$ npm run release major
+$ npm run release minor -- --preid beta
+// or
+$ release --only-docs
+$ release major
+$ release minor --preid beta
+```