Commit Graph

569 Commits

Author SHA1 Message Date
Paul O’Shannessy 8fa006c892 Merge pull request #2875 from kchia/patch-2
Update 03-interactivity-and-dynamic-uis.md: correct typo
2015-01-22 13:17:33 -08:00
Cheng Lou b8adf96d4b Merge pull request #2859 from javawizard/patch-1
ref-08-reconciliation.md: grammar/punctuation fixes
2015-01-16 16:30:48 -08:00
Paul O’Shannessy 9a7cfb95dc Merge pull request #2824 from zpao/docs-tutorial-server
[docs] Talk about running a server in tutorial
2015-01-16 16:30:48 -08:00
Paul O’Shannessy 371548b90c Merge pull request #2801 from jsfb/componentDidUpdate-docs
Update docs to indicate that componentDDidUpdate is fired after changes are flushed to the DOM.  Fix
2015-01-16 16:30:48 -08:00
Paul O’Shannessy 17d947a671 Merge pull request #2791 from rickbeerendonk/patch-1
Update ref-09-glossary.md
2015-01-16 16:30:48 -08:00
Paul O’Shannessy bb212f5a60 Merge pull request #2788 from mihaip/master
SyntheticEvent.timeStamp is a number, not a Date
2015-01-16 16:30:48 -08:00
Paul O’Shannessy b4b4aab162 Merge pull request #2773 from vanesyan/patch-1
Update ref-01-top-level-api.md
2015-01-16 16:30:48 -08:00
Paul O’Shannessy 35929909ae Merge pull request #2734 from Minwe/master
add Forms and Event System docs Chinese translation
2015-01-16 16:30:47 -08:00
Paul O’Shannessy 69a7e3969b Merge pull request #2733 from morenoh149/patch-1
Added note for proper example display
2015-01-16 16:30:47 -08:00
Paul O’Shannessy 6500fd26c5 Merge pull request #2707 from camsong/master
More Chinese Doc Translation
2015-01-16 16:30:47 -08:00
Paul O’Shannessy 132a022936 Merge pull request #2675 from af/topLevelAPIDocs
Top level api docs for createFactory
2015-01-16 16:30:47 -08:00
Paul O’Shannessy 2e2bcbd861 Merge pull request #2360 from beausmith/patch-1
Highlighted changed lines in examples
2015-01-16 16:30:47 -08:00
Paul O’Shannessy 9d2ab67164 Merge pull request #2297 from pedronauck/docs-namespace-in-jsx
Add a section at 'jsx-in-depth' talking about namespaced components
2015-01-16 16:30:47 -08:00
Paul O’Shannessy e6e60c4fa8 update docs for 0.12.2 changes 2014-12-18 12:30:22 -08:00
Paul O’Shannessy b02db228ca Merge pull request #2718 from alextsg/patch-1
Update tutorial.md for grammatical changes
2014-12-16 12:32:34 -08:00
Paul O’Shannessy c7ff4447e0 Merge pull request #2705 from Swader/patch-1
Update 02-displaying-data.md
2014-12-16 12:32:34 -08:00
Paul O’Shannessy d9094a1418 Merge pull request #2694 from camsong/master
Add Chinese translation of js-spread
2014-12-16 12:32:34 -08:00
Paul O’Shannessy d6440d6179 Merge pull request #2689 from camsong/master
Add Chinese translation of jsx-in-depth
2014-12-16 12:32:34 -08:00
Paul O’Shannessy 3e17992257 Merge pull request #2679 from tschaub/patch-1
Add missing verb in docs
2014-12-16 12:32:34 -08:00
Ben Alpert b82a3c51c5 Merge pull request #2672 from cookfront/master
The same problem in issue #2648
2014-12-16 12:32:34 -08:00
Cheng Lou 84e461f5e3 Merge pull request #2671 from benkeen/patch-1
Update 10.6-update.md
2014-12-16 12:32:34 -08:00
Paul O’Shannessy e9f344c030 Merge pull request #2635 from zpao/docs/props-state-clarification
[docs] Clarify when state may duplicate props
2014-12-03 14:52:59 -08:00
Paul O’Shannessy 250060981d Merge pull request #2639 from zpao/own-jsfiddle
Own our fiddles so we can update them more easily
2014-12-03 14:52:59 -08:00
Paul O’Shannessy 308112dbd2 Merge pull request #2649 from cookfront/master
In `Transferring Props` guide, `Manual Transfer` section will lead an er...
2014-12-03 14:52:59 -08:00
Paul O’Shannessy 0bd6bdaa64 Merge pull request #2615 from af/createElement-docs
Add top-level API docs section for React.createElement.
2014-12-03 14:52:59 -08:00
Paul O’Shannessy bfaddf42ae Merge pull request #2636 from zpao/docs/spread-assign-update
[docs] Remove generic spread, Object.assign  mentions
2014-12-03 14:52:59 -08:00
Paul O’Shannessy 5dd855c898 Merge pull request #2622 from rafd/patch-1
add note re: handling events in capture phase
2014-12-03 14:52:59 -08:00
Paul O’Shannessy a4d2e97400 Merge pull request #2623 from jbhatab/patch-1
Screencast interfacing react + backbone
2014-12-03 14:52:59 -08:00
Paul O’Shannessy b112a27aa0 Merge pull request #2616 from christianalfoni/patch-3
Adding link to wiki
2014-12-03 14:52:59 -08:00
Paul O’Shannessy 8eef2fcd3d Merge pull request #2633 from koba04/fix-addons-document
Fix addons documentation of development only part
2014-12-03 14:52:02 -08:00
Paul O’Shannessy 725c545589 Merge pull request #2630 from shamrin/patch-1
fix typo in addons.update() $splice command help
2014-12-03 14:48:36 -08:00
Cheng Lou 0f9739a4f2 Merge pull request #2555 from mfunkie/patch-1
Animation documentation for ReactTransitionGroup
2014-11-19 15:35:55 +00:00
Paul O’Shannessy 3efc8c8aa9 Merge pull request #2554 from samccone/patch-1
Update tutorial language to be more explicit.
2014-11-19 15:35:44 +00:00
Paul O’Shannessy ae13325143 Merge pull request #2544 from mjul/patch-1
Update 10.4-test-utils.md
2014-11-19 15:33:51 +00:00
Cheng Lou 7dd33967b6 Merge pull request #2514 from jvalente/patch-1
Update ref-09-glossary.md
2014-11-19 15:33:42 +00:00
Paul O’Shannessy 8dc8b0fd44 Merge pull request #2498 from ikr/patch-1
There's no isComponentOfType() anymore
2014-11-19 15:33:31 +00:00
Paul O’Shannessy bc8baef372 Merge pull request #2473 from zertosh/docs-ssr-at-sc
Add React at SoundCloud talk
2014-11-19 15:31:36 +00:00
Paul O’Shannessy ed1ca69183 Merge pull request #2463 from fson/render-to-string-docs
Update React.renderToString argument type in docs
2014-11-05 16:15:25 -08:00
Paul O’Shannessy a47c6d3717 Merge pull request #2434 from Shraymonks/propTypes-docs
Update deprecated propTypes
2014-11-05 16:15:20 -08:00
Cheng Lou 9ee824e5de Merge pull request #2418 from spencer48/patch-1
(docs) Added commas to increase readability.
2014-10-29 18:17:25 -07:00
Paul O’Shannessy a354e65974 Merge pull request #2428 from cody/fixes
React.renderComponent --> React.render
2014-10-29 18:16:58 -07:00
Paul O’Shannessy 0c1191d2bc Merge pull request #2419 from johnheroy/patch-1
Add comma for readability in tutorial.md
2014-10-29 18:16:19 -07:00
Cheng Lou 539db8e9c8 Merge pull request #2414 from benleiken/patch-1
Moved key requirement note into 'getting started'
2014-10-28 11:06:31 -07:00
Sebastian Markbage 1cb3f25e78 More Descriptor -> Element renames 2014-10-28 11:06:31 -07:00
Sebastian Markbage b7a548c4bf Replace transferPropsTo with transferring props patterns 2014-10-28 11:06:30 -07:00
Sebastian Markbage 9b1ee4de46 Updated Docs for new JSX Changes
Moved non-JSX explanation to Displaying Data.
Overhauled JSX in Depth.
Added JSX Spread Section.
2014-10-28 11:06:30 -07:00
Paul O’Shannessy 0dd942b121 Update Animation docs for createElement 2014-10-28 11:06:30 -07:00
Paul O’Shannessy eb2827ec6a Update React.DOM -> React.createElement through docs 2014-10-28 11:06:30 -07:00
Paul O’Shannessy d36d26a574 [docs] Glossary
Pulled in https://gist.github.com/sebmarkbage/fcb1b6ab493b0c77d589
mostly verbatim
2014-10-23 20:51:11 -07:00
Paul O’Shannessy a90b4c9b3e Update properties/elements 2014-10-23 20:51:11 -07:00