Merge branch 'master' into pr457

Conflicts:
	src/Carousel.js

.editorconfig

@@ -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

.eslintrc

@@ -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
+  }
+}

.gitignore

@@ -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/

.npmignore

@@ -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/

.travis.yml

@@ -2,3 +2,5 @@ sudo: false
 language: node_js
 node_js:
   - "0.10"
+  - "0.12"
+  - "iojs"

CHANGELOG.md

@@ -1,3 +1,15 @@
+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
 ---------------------------------------
 

CONTRIBUTING.md

@@ -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