zpao

diff --git a/src/browser/ui/ReactDefaultInjection.js b/src/browser/ui/ReactDefaultInjection.js
index c290403..8a79942 100644
--- a/src/browser/ui/ReactDefaultInjection.js
+++ b/src/browser/ui/ReactDefaultInjection.js
@@ -49,7 +49,7 @@ var ServerReactRootIndex = require('ServerReactRootIndex');
 var SimpleEventPlugin = require('SimpleEventPlugin');
 var BeforeInputEventPlugin = require('BeforeInputEventPlugin');
 
-var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
+var ReactRAFBatchingStrategy = require('ReactRAFBatchingStrategy');

zpao

/** @jsx React.DOM */

var SWF = React.createClass({
  componentDidMount: function() {
    var newNode = document.createElement('div');
    var myNode = this.getDOMNode();
    myNode.appendChild(newNode);
    swfobject.embedSWF(this.props.file, newNode);
  },

zpao

diff --git a/src/browser/ui/dom/HTMLDOMPropertyConfig.js b/src/browser/ui/dom/HTMLDOMPropertyConfig.js
index b3f569e..c2448f3 100644
--- a/src/browser/ui/dom/HTMLDOMPropertyConfig.js
+++ b/src/browser/ui/dom/HTMLDOMPropertyConfig.js
@@ -137,6 +137,12 @@ var HTMLDOMPropertyConfig = {
     autoCorrect: null, // Supported in Mobile Safari for keyboard hints
     property: null // Supports OG in meta tags
   },
+  OverrideProperties: {
+    progress: {

zpao

diff --git a/.travis.yml b/.travis.yml
index c12cae6..cf0ded3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,15 +31,7 @@ env:
   matrix:
   - TEST_TYPE=test
   - TEST_TYPE=lint
-  - TEST_TYPE=perf:full
-  - TEST_TYPE=test:coverage

zpao

--- !ruby/object:Gem::Specification
name: react-source
version: !ruby/object:Gem::Version
  version: 0.12.0.pre.alpha
platform: ruby
authors:
- Paul O’Shannessy
autorequire: 
bindir: bin
cert_chain: []

zpao

require 'maruku'
require 'rdiscount'

CODE = <<-MD
# this is markdown now

```
hello word
```
MD

zpao

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 571551a..781ce9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,8 @@
 ### React Tools
 
 * Update `esprima` and `jstransform` for correctness fixes
-* The `jsx` executable now exposes a `--strip-types` flag which can be used to remove Typescript-like type annotations
-  * This option is also exposed to `require('react-tools').transform`

zpao

   354	Paul O’Shannessy <[email protected]>
   340	Ben Alpert <[email protected]>
   206	Pete Hunt <[email protected]>
   136	Cheng Lou <[email protected]>
   112	Jeff Morrison <[email protected]>
   110	Thomas Aylott <[email protected]>
    89	Ben Newman <[email protected]>
    62	Vjeux <[email protected]>
    61	Timothy Yung <[email protected]>
    53	Andreas Svensson <[email protected]>

zpao

4dcc116 Update @emails in react-displayName-test
ce19af9 Inject the runtime to a global instead of exposing internals
dcf415c BSD + PATENTS
cf5fea4 JSXTransformer: don't look for docblock
0dccf64 Sync upstream modules
1c86f58 Codemod deprecated API usage away
9b1fa91 React.renderComponent -> React.render
a4e923b Sanitize the string tag passed to DOM components
6ddf8de Look for devtools global hook
688f64c Require list property to be accessed as an attribute

zpao

diff --git a/npm-react/package.json b/npm-react/package.json
index 3377a1d..ce7832f 100644
--- a/npm-react/package.json
+++ b/npm-react/package.json
@@ -27,6 +27,9 @@
     "envify": "^2.0.0"
   },
   "browserify": {
-    "transform": ["envify"]
+    "transform": ["envify"],