Merge tag 'v0.23.2' into v0.24-rc

v0.23.2

Conflicts:
	package.json

Author: mtscout6

.eslintrc

@@ -11,24 +11,24 @@
     "react"
   ],
   "rules": {
-    "comma-spacing": 1,
+    "comma-spacing": 2,
     "key-spacing": 0,
     "no-underscore-dangle": 0,
-    "no-unused-vars": [1, { "vars": "all", "args": "none" }],
+    "no-unused-vars": [2, { "vars": "all", "args": "none" }],
     "no-var": 2,
-    "object-shorthand": 1,
-    "quotes": [1, "single", "avoid-escape"],
+    "object-shorthand": 2,
+    "quotes": [2, "single", "avoid-escape"],
     "react/display-name": 0,
-    "react/jsx-no-undef": 1,
-    "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, { ignore: [children, className] }],
-    "react/react-in-jsx-scope": 1,
-    "react/self-closing-comp": 1,
-    "react/wrap-multilines": 1,
-    "react/jsx-uses-vars": 1,
+    "react/jsx-no-undef": 2,
+    "react/jsx-uses-react": 2,
+    "react/no-did-mount-set-state": 2,
+    "react/no-did-update-set-state": 2,
+    "react/no-multi-comp": 2,
+    "react/prop-types": [2, { ignore: [children, className] }],
+    "react/react-in-jsx-scope": 2,
+    "react/self-closing-comp": 2,
+    "react/wrap-multilines": 2,
+    "react/jsx-uses-vars": 2,
     "strict": 0
   }
 }

.gitignore

@@ -9,7 +9,6 @@ lib/
 dist/
 !tools/dist/
 docs-built/
-ie8/bundle.js
 tmp-bower-repo/
 tmp-docs-repo/
 .babel-cache/

CHANGELOG.md

@@ -1,3 +1,14 @@
+v0.23.2 - Mon, 08 Jun 2015 18:56:48 GMT
+---------------------------------------
+
+- [7211dcb](../../commit/7211dcb) [added] Add prevIcon and nextIcon props as node proptypes to Carousel
+- [5734ec3](../../commit/5734ec3) [added] Pagination component
+- [2f8c454](../../commit/2f8c454) [changed] Assert ProgressBar children can be ProgressBar only.
+- [2c46820](../../commit/2c46820) [added] `createSelectedEvent` for consistent onSelect handling
+- [c2ff9ad](../../commit/c2ff9ad) [added] property disabled on MenuItem
+
+
+
 v0.23.1 - Tue, 02 Jun 2015 16:57:57 GMT
 ---------------------------------------
 

MAINTAINING.md

@@ -51,7 +51,7 @@ helping out.
 
 GitHub by default does not publicly state that you are a member of the
 organization. Please feel free to change that setting for yourself so others
-will know who's helping out. That can be configured on [organization
+will know who's helping out. That can be configured on the [organization
 list](https://github.com/orgs/react-bootstrap/people) page.
 
 Being a maintainer is not an obligation. You can help when you have time and be
@@ -77,7 +77,7 @@ Example usages of the release script:
 $ ./tools/release patch
 $ ./tools/release minor
 $ ./tools/release major
-$ ./tools/release minor --pre beta
+$ ./tools/release minor --preid beta
 ```
 
 Note that the above commands will bump the [semver](http://semver.org) version

README.md

@@ -3,11 +3,14 @@
 [Bootstrap 3][bootstrap] components built with [React][react]
 
 [![Travis Build Status][build-badge]][build]
-[![NPM version][npm-badge]][npm]
-[![Bower version][bower-badge]][bower]
+[![Build status][appveyor-badge]][appveyor]
+
 [![HuBoard][huboard-badge]][huboard]
 [![Gitter][gitter-badge]][gitter]
 
+[![NPM version][npm-badge]][npm]
+[![Bower version][bower-badge]][bower]
+
 [![Dependency Status][deps-badge]][deps]
 [![devDependency Status][dev-deps-badge]][dev-deps]
 [![peerDependency Status][peer-deps-badge]][peer-deps]
@@ -73,4 +76,4 @@ Yes please! See the [contributing guidelines][contributing] for details.
 [huboard]: https://huboard.com/react-bootstrap/react-bootstrap
 
 [appveyor-badge]: https://ci.appveyor.com/api/projects/status/ylitpyo6n5yq1s6i/branch/master?svg=true
-[appveyor]: https://ci.appveyor.com/project/mtscout6/react-bootstrap/branch/master
+[appveyor]: https://ci.appveyor.com/project/react-bootstrap/react-bootstrap/branch/master

appveyor.yml

@@ -0,0 +1,17 @@
+version: '{build}'
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Get the latest stable version of io.js
+  - ps: Install-Product node ''
+  - npm -g install npm@latest
+  - set PATH=%APPDATA%\npm;%PATH%
+  - node --version
+  - npm --version
+  - npm install
+
+# No need for MSBuild on this project
+build: off
+
+test_script:
+  - npm test

appveyor.yml.tmp

@@ -29,6 +29,7 @@
  * Responsive tests
  * Glyphicons
  * Customizer
+ * MenuItem
  * Miscellaneous
  */
 
@@ -1127,6 +1128,14 @@ h1[id] {
   overflow: auto;
 }
 
+/* MenuItem */
+.bs-example .dropdown-menu.open {
+  position: static;
+  display: block;
+  margin-bottom: 5px;
+  clear: left;
+}
+
 
 /*
  * Code snippets

docs/assets/docs.css

@@ -39,6 +39,7 @@
     "PageHeader",
     "PageItem",
     "Pager",
+    "Pagination",
     "Panel",
     "PanelGroup",
     "Popover",

docs/examples/.eslintrc

@@ -0,0 +1,26 @@
+function onSelectAlert(eventKey, href, target) {
+  alert('Alert from menu item.\neventKey: "' + eventKey + '"\nhref: "' + href + '"');
+}
+
+function preventDefault() {}
+
+const MenuItems = (
+  <div className="clearfix">
+    <ul className="dropdown-menu open">
+      <MenuItem header>Header</MenuItem>
+      <MenuItem onSelect={preventDefault}>link</MenuItem>
+      <MenuItem divider/>
+      <MenuItem header>Header</MenuItem>
+      <MenuItem onSelect={preventDefault}>link</MenuItem>
+      <MenuItem disabled>disabled</MenuItem>
+      <MenuItem title="See? I have a title." onSelect={preventDefault}>
+        link with title
+      </MenuItem>
+      <MenuItem eventKey={1} href="#someHref" onSelect={onSelectAlert}>
+        link that alerts
+      </MenuItem>
+    </ul>
+  </div>
+);
+
+React.render(MenuItems, mountNode);