dillon1000/react

Commits/765ee8e5d0

Commit

Merge upstream changes

remixz authored 5/20/2014, 3:12:57 AM 765ee8e5d0e8c309c0e4d87ba15466c46e6b0138 Parent 3f31ec4, 2d26451

Changed paths24 files

First-parent comparison

M .travis.yml Modified M Gruntfile.js Modified M README.md Modified M docs/docs/09.4-test-utils.md Modified M docs/docs/getting-started.md Modified M docs/docs/ref-01-top-level-api.md Modified M docs/docs/ref-02-component-api.md Modified M docs/docs/ref-04-tags-and-attributes.md Modified A jest/environment.js Added A jest/preprocessor.js Added M package.json Modified M src/addons/transitions/ReactTransitionChildMapping.js Modified M src/addons/update.js Modified M src/browser/ReactEventEmitter.js Modified M src/browser/eventPlugins/AnalyticsEventPluginFactory.js Modified M src/browser/ui/ReactDOMComponent.js Modified M src/browser/ui/dom/DOMProperty.js Modified M src/browser/ui/dom/DOMPropertyOperations.js Modified M src/browser/ui/dom/HTMLDOMPropertyConfig.js Modified M src/browser/ui/dom/dangerousStyleValue.js Modified D src/browser/ui/dom/filterAttributes.js Deleted M src/core/ReactCompositeComponent.js Modified M src/event/EventPluginRegistry.js Modified M vendor/browser-transforms.js Modified

Patch

Files changed

Rendering syntax-highlighted changes…