dillon1000/react

Commit

Merge branch '0.12-stable'

Browse files
Changed paths75 files
First-parent comparison
M .mailmap ModifiedM AUTHORS ModifiedM CHANGELOG.md ModifiedM README.md ModifiedM docs/Rakefile ModifiedM docs/_data/acknowledgements.yml ModifiedM docs/_data/nav_docs.yml ModifiedM docs/_js/examples/hello.js ModifiedM docs/_js/examples/markdown.js ModifiedM docs/_js/examples/timer.js ModifiedM docs/_js/examples/todo.js ModifiedM docs/_js/html-jsx.js ModifiedM docs/_js/jsx-compiler.js ModifiedM docs/_js/live_editor.js ModifiedM docs/_posts/2014-10-16-react-v0.12-rc1.md ModifiedA docs/_posts/2014-10-28-react-v0.12.md AddedM docs/docs/02-displaying-data.md ModifiedM docs/docs/02-displaying-data.zh-CN.md ModifiedM docs/docs/02.1-jsx-in-depth.md ModifiedA docs/docs/02.2-jsx-spread.md AddedR docs/docs/02.2-jsx-gotchas.md →docs/docs/02.3-jsx-gotchas.md RenamedM docs/docs/05-reusable-components.md ModifiedA docs/docs/06-transferring-props.md AddedR docs/docs/06-forms.md →docs/docs/07-forms.md RenamedR docs/docs/07-working-with-the-browser.md →docs/docs/08-working-with-the-browser.md RenamedR docs/docs/07.1-more-about-refs.md →docs/docs/08.1-more-about-refs.md RenamedR docs/docs/08-tooling-integration.md →docs/docs/09-tooling-integration.md RenamedR docs/docs/09-addons.md →docs/docs/10-addons.md RenamedR docs/docs/09.1-animation.md →docs/docs/10.1-animation.md RenamedR docs/docs/09.2-form-input-binding-sugar.md →docs/docs/10.2-form-input-binding-sugar.md RenamedR docs/docs/09.3-class-name-manipulation.md →docs/docs/10.3-class-name-manipulation.md RenamedR docs/docs/09.4-test-utils.md →docs/docs/10.4-test-utils.md RenamedR docs/docs/09.5-clone-with-props.md →docs/docs/10.5-clone-with-props.md RenamedR docs/docs/09.6-update.md →docs/docs/10.6-update.md RenamedR docs/docs/09.7-pure-render-mixin.md →docs/docs/10.7-pure-render-mixin.md RenamedR docs/docs/09.8-perf.md →docs/docs/10.8-perf.md RenamedM docs/docs/getting-started.md ModifiedM docs/docs/getting-started.zh-CN.md ModifiedM docs/docs/ref-01-top-level-api.md ModifiedM docs/docs/ref-02-component-api.md ModifiedM docs/docs/ref-04-tags-and-attributes.md ModifiedM docs/docs/ref-08-reconciliation.md ModifiedA docs/docs/ref-09-glossary.md AddedM docs/docs/tutorial.md ModifiedM docs/tips/03-if-else-in-JSX.md ModifiedM docs/tips/16-references-to-components.md ModifiedM examples/ballmer-peak/example.js ModifiedM examples/basic-commonjs/index.js ModifiedM examples/basic-jsx-external/example.js ModifiedM examples/basic-jsx-harmony/index.html ModifiedM examples/basic-jsx-precompile/example.js ModifiedM examples/basic-jsx/index.html ModifiedM examples/basic/index.html ModifiedM examples/jquery-bootstrap/js/app.js ModifiedM examples/jquery-mobile/js/app.js ModifiedM examples/server-rendering/README.md ModifiedM examples/server-rendering/jsapp/package.json ModifiedM examples/server-rendering/jsapp/src/App.js ModifiedM examples/server-rendering/reactserver/package.json ModifiedM examples/server-rendering/reactserver/server.js ModifiedM examples/server-rendering/webapp/index.php ModifiedM examples/transitions/index.html ModifiedM perf/index.html ModifiedM perf/lib/BrowserPerfRunnerContext.react.js ModifiedM perf/lib/todolist.html ModifiedM perf/tests/basic-unmount.js ModifiedM perf/tests/propTypes.js ModifiedM perf/tests/renderComponent-basic.js ModifiedM perf/tests/setState-callback-5.js ModifiedM perf/tests/setState-callback.js ModifiedM perf/tests/shouldComponentUpdate.js ModifiedM perf/tests/todolist-add.js ModifiedM perf/tests/todolist-do-stuff.js ModifiedM perf/tests/todolist-edit.js ModifiedM perf/tests/todolist-mount.js Modified
Patch

Files changed

Rendering syntax-highlighted changes…