dillon1000/react

Commit

Merge branch 'master' of https://github.com/facebook/react

* 'master' of https://github.com/facebook/react: (30 commits)
  Expose --target flag on jsx executable
  Contributing: cleanup quote style
  Add Relay blog post
  Fix long lines in vendor/fbtransform/visitors
  lint vendor/*.js
  fix .eslintignore
  remove ballmer example
  Fix a doc. cloneWithProps clones a ReactElement.
  lint from root
  Fixed mistake in jsdocs types for cloneWithProps
  Put deprecation warning for classSet
  Lint vendor/fbtransform as well
  More warnings to ReactFragment.create
  Warn when using constructor function directly
  Move option parsing into react-tools proper.
  Remove lodash devDependency
  Added the immutability talk to the React.js Conf update.
  Use same pathways for browser transforms as we use in react-tools
  lint: remove spaces from array brackets
  lint: remove spaces from object braces
  ...
Browse files
Naman Goel authored 34d5e05199e7e9d32c4078536baf991505f3a91a Parent 20d3f0d, 5ab7fde
Changed paths85 files
First-parent comparison
M .eslintignore ModifiedM CONTRIBUTING.md ModifiedM bin/jsx ModifiedA docs/_js/examples/.eslintrc AddedM docs/_posts/2013-09-24-community-roundup-8.md ModifiedM docs/_posts/2013-11-05-thinking-in-react.md ModifiedM docs/_posts/2013-12-23-community-roundup-12.md ModifiedM docs/_posts/2014-01-06-community-roundup-14.md ModifiedA docs/_posts/2015-02-18-react-conf-roundup-2015.md AddedA docs/_posts/2015-02-20-introducing-relay-and-graphql.md AddedM docs/docs/06-transferring-props.md ModifiedM docs/docs/10.3-class-name-manipulation.md ModifiedM docs/docs/10.5-clone-with-props.md ModifiedM docs/docs/thinking-in-react.md ModifiedM docs/extractCode.js ModifiedD examples/ballmer-peak/ballmer_peak.png DeletedD examples/ballmer-peak/example.js DeletedM examples/basic-commonjs/index.js ModifiedM examples/jquery-bootstrap/js/app.js ModifiedM examples/jquery-mobile/js/app.js ModifiedA examples/quadratic/example.js AddedR examples/ballmer-peak/index.html →examples/quadratic/index.html RenamedM examples/server-rendering/jsapp/src/App.js ModifiedM examples/server-rendering/reactserver/server.js ModifiedM grunt/config/browserify.js ModifiedM grunt/config/jsx.js ModifiedM grunt/config/webdriver-all.js ModifiedM grunt/tasks/eslint.js ModifiedM grunt/tasks/npm.js ModifiedM grunt/tasks/release.js ModifiedM jest/preprocessor.js ModifiedM jest/ts-preprocessor.js ModifiedM main.js ModifiedM npm-jsx_orphaned_brackets_transformer/run.js ModifiedM npm-jsx_orphaned_brackets_transformer/transforms/react.js ModifiedM package.json ModifiedM perf/lib/BrowserPerfRunnerApp.react.js ModifiedM perf/lib/BrowserPerfRunnerContext.react.js ModifiedM perf/lib/todolist.browser.js ModifiedM perf/tests/setState-callback-5.js ModifiedM perf/tests/setState-callback.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 ModifiedM src/addons/ReactFragment.js ModifiedM src/addons/__tests__/ReactFragment-test.js ModifiedM src/browser/__tests__/ReactDOM-test.js ModifiedM src/browser/ui/__tests__/ReactDOMComponent-test.js ModifiedM src/browser/ui/dom/CSSProperty.js ModifiedM src/classic/class/ReactClass.js ModifiedM src/classic/class/__tests__/ReactBind-test.js ModifiedM src/classic/class/__tests__/ReactClass-test.js ModifiedM src/classic/element/ReactElement.js ModifiedM src/classic/element/__tests__/ReactElement-test.js ModifiedM src/classic/element/__tests__/ReactElementValidator-test.js ModifiedM src/core/__tests__/ReactComponentLifeCycle-test.js ModifiedM src/core/__tests__/ReactCompositeComponent-test.js ModifiedM src/core/__tests__/ReactCompositeComponentNestedState-test.js ModifiedM src/core/__tests__/ReactCompositeComponentState-test.js ModifiedM src/core/__tests__/ReactIdentity-test.js ModifiedM src/core/__tests__/ReactInstanceHandles-test.js ModifiedM src/core/__tests__/ReactMockedComponent-test.js ModifiedM src/core/__tests__/ReactMultiChildReconcile-test.js ModifiedM src/core/__tests__/ReactUpdates-test.js ModifiedM src/core/__tests__/refs-test.js ModifiedM src/modern/class/__tests__/ReactES6Class-test.js ModifiedM src/modern/element/__tests__/ReactJSXElement-test.js ModifiedM src/modern/element/__tests__/ReactJSXElementValidator-test.js ModifiedM src/test/ReactTestUtils.js ModifiedM src/test/__tests__/ReactTestUtils-test.js ModifiedM src/utils/__tests__/ReactChildren-test.js ModifiedM src/utils/__tests__/traverseAllChildren-test.js ModifiedM src/utils/cloneWithProps.js ModifiedM src/vendor/key-mirror/__tests__/keyMirror-test.js ModifiedM src/vendor/stubs/cx.js ModifiedM vendor/browser-transforms.js ModifiedA vendor/fbtransform/.eslintrc AddedM vendor/fbtransform/transforms/__tests__/react-displayName-test.js ModifiedM vendor/fbtransform/transforms/__tests__/react-test.js ModifiedM vendor/fbtransform/transforms/react.js ModifiedM vendor/fbtransform/transforms/reactDisplayName.js ModifiedM vendor/fbtransform/transforms/xjs.js ModifiedM vendor/fbtransform/visitors.js ModifiedA vendor/inline-source-map.js Added
Patch

Files changed

Rendering syntax-highlighted changes…