Commit Graph

916 Commits

Author SHA1 Message Date
Christopher Chedeau dec41bbbca Merge pull request #2356 from vjeux/roundup_23
Community round-up #23
2014-10-17 07:58:40 -07:00
Christopher Chedeau 6470920125 Community round-up #23 2014-10-17 07:56:28 -07:00
Paul O’Shannessy aca264e399 0.12 rc1 release materials
* blog post
* starter kit
2014-10-16 15:31:52 -07:00
Paul O’Shannessy 5263f61c87 Merge pull request #2357 from jimjea/patch-1
Minor grammar change to Thinking in React
2014-10-15 17:01:57 -07:00
Jimmy Jea 43dbd29bb1 minor change to post
Hello,

I was just reading through your post and noticed a minor change. The sentence originally read, "It's scaled very well for us...". I thought it was a little unclear since it's can mean "it has" or "it is", which can make this sentence take on a whole different meaning.
2014-10-15 16:36:30 -07:00
Paul O’Shannessy dcbc64ac76 [docs] Move React Elements post to right place, fix typo
The URL already made its way around so we can't just break it. We might
want to just live with it instead of even doing this redirect.

https://github.com/plaxdan/react/commit/2b225446c03192b58e176f8885e60055cf5ea436#commitcomment-8176218
2014-10-15 16:10:03 -07:00
Paul O’Shannessy e7f509d3a3 0.11.2 release materials
TODO: starter kit for cherry-pick to master
(cherry picked from commit 732ffad313)
2014-10-15 15:55:12 -07:00
Ben Alpert b8229cc761 Fix typo in blog post 2014-10-15 10:09:23 -07:00
Paul O’Shannessy 2b225446c0 React Elements blog post 2014-10-14 10:59:15 -07:00
Paul O’Shannessy dcf415c2b9 BSD + PATENTS 2014-10-10 13:34:07 -07:00
Paul O’Shannessy 35764c5ffb [docs] Use subitem in new nav generation
(cherry picked from commit 995d0e588b)
2014-09-29 13:48:25 -07:00
Jacob Gable 0b3c0ebced Spelling fix
- Puting -> Putting
2014-09-26 12:42:58 -05:00
fisherwebdev f45d753486 Merge pull request #2236 from zpao/rm-flux-docs 2014-09-26 07:03:37 -07:00
Paul O’Shannessy 6c19040d24 Point to Flux site for Flux docs
This doesn't actually remove the pages, just the main content. Sidebar
items now link offsite. The pages doesn't automatically redirect, but we
could do that if we really wanted.

Fixes #2229
2014-09-25 12:34:22 -07:00
Bill Fisher ef327fcb23 Merge pull request #2240 from christianalfoni/patch-1
Update flux-todo-list.md
2014-09-25 08:33:02 -07:00
Christian Alfoni 1b6a3d5215 Update flux-todo-list.md
You have to instantiate a Dispatcher to use it, not just grab the prototype or it will fail when trying to grab instance properties like: this.$Dispatcher._callbacks.
2014-09-25 11:54:52 +02:00
Oleksii Markhovskyi 5493b63b44 fix typos 2014-09-25 09:54:35 +02:00
Paul O’Shannessy 4f27dc30ad Merge pull request #2228 from XuefengWu/patch-1
add tip for the important jsx convention
2014-09-24 15:35:36 -07:00
fisherwebdev 9952a54026 [blog] testing flux applications 2014-09-24 12:35:39 -07:00
XuefengWu b9f32a8295 Update getting-started.md
fix grammar
2014-09-24 08:26:10 +08:00
XuefengWu f04d648888 Update getting-started.md
merge the warn and explain for the @jsx
2014-09-23 15:22:11 +08:00
Paul O’Shannessy 176d47319a Merge pull request #2225 from jesseskinner/patch-1
Fix inconsistency in mockComponent argument name
2014-09-22 14:42:38 -07:00
Paul O’Shannessy 9919734df3 Merge pull request #2180 from zpao/fix-2179
Reword Component API intro
2014-09-22 14:41:18 -07:00
Paul O’Shannessy eafe786aef Reword Component API intro
Fixes #2179
2014-09-22 14:40:22 -07:00
Paul O’Shannessy bf0fe94561 Merge pull request #2209 from glenjamin/patch-2
[docs] Clarify wording on sub-tree reconciliation
2014-09-22 14:32:18 -07:00
Paul O’Shannessy 8cd460ce24 Move examples from the website to the wiki. 2014-09-22 14:29:39 -07:00
XuefengWu 0ae09f4c70 add tip for the important jsx convention
I missed the convention and wast hours to figure out what's wrong. 
Add this tip in the document for who would miss the importance comment.
2014-09-22 20:10:34 +08:00
fisherwebdev 0e4e7ea7e1 Acknowledge ProjectMoon for allowing us to use the flux name on npm 2014-09-21 21:10:39 -07:00
Jesse Skinner 3109082144 Fix inconsistency in mockComponent argument name
The second argument of mockComponent was listed as tagName, but referred to in the description as mockTagName. I changed the first one to mockTagName to be consistent.
2014-09-21 23:00:25 -04:00
Jacob Greenleaf 8882f19187 Fix typo in documentation in Flux Todo List 2014-09-18 18:30:57 -07:00
Glen Mailer cf512bf60d [docs] Clarify wording on sub-tree reconciliation
The previous wording could be interpreted to mean sub-trees moving from
within one sibling to within another, rather than the shuffling of siblings on
a single level as intended
2014-09-18 22:48:35 +01:00
Christopher Chedeau aa25eb8e40 Update 2014-09-12-community-round-up-22.md 2014-09-12 11:34:29 -07:00
Christopher Chedeau 05cec04367 Merge pull request #2186 from vjeux/roundup_22
Community roundup #22
2014-09-12 11:06:25 -07:00
Christopher Chedeau d53a365e77 Community roundup #22 2014-09-12 10:35:30 -07:00
Paul O’Shannessy a10436d4ab Merge pull request #2097 from fitzgen/explain-where-to-provide-key
Explain where to provide the key for dynamic children.
2014-09-11 14:14:55 -07:00
Ben Foxall fe08888fbb Less -> Fewer
bugs and bytes are countable, so should be fewer
2014-09-11 14:33:16 +01:00
Nick Fitzgerald 18874a6054 Explain where to provide the key for dynamic children. 2014-09-10 14:53:41 -07:00
Paul O’Shannessy 76d64812e1 Merge pull request #2170 from undernewmanagement/patch-1
Added extra explanation for require() statements
2014-09-10 13:21:47 -07:00
Sheraz 9e6c442df0 Updated small change with zuggestions from @zpao 2014-09-10 12:29:54 +02:00
Paul O’Shannessy 53be3905f8 Merge pull request #2167 from mhintz/patch-1
Update ref-03-component-specs.md
2014-09-09 16:00:39 -07:00
Mark Anderson e8e50986c5 Added extra explanation for require() statements 2014-09-09 14:39:07 +02:00
Mark Hintz 95def7f829 Update ref-03-component-specs.md
Edit the description of componentDidMount() to make clear that the function is called only once during the lifecycle of the component, after only the initial render() call. The description is now similar to that for componentWillMount(). The existing wording does not make it clear that the function is called only after the initial render. (Granted, it is possible to infer this from descriptions of the component lifecycle found elsewhere in the documentation, but I think explicit is better than implicit in this case).
2014-09-09 11:50:13 +02:00
Oliver Zeigermann 8601a3c27d Update 09.5-clone-with-props.md 2014-09-09 10:52:26 +02:00
Paul O’Shannessy adb62c76e5 Merge pull request #2158 from Daniel15/htmltojsx-move
Move htmltojsx.js to React-Magic project.
2014-09-07 18:52:37 -07:00
Daniel Lo Nigro 6ceb47e8bf console.warn when html-jsx-lib.js is loaded 2014-09-07 15:20:42 -07:00
Paul O’Shannessy 4398879c2e Merge pull request #2155 from rickbeerendonk/patch-1
Update video.md with Forward JS 2014 talk
2014-09-07 14:31:03 -07:00
Daniel Lo Nigro 1d1b6ed07a Move htmltojsx.js to React-Magic project.
The HTMLtoJSX file is really a part of the React-Magic project, and should belong there rather than here:
 - It doesn't really follow the release cycle of React at all
 - It is totally standalone with no dependency on React
 - The only usage of this script is in React-Magic and on the HTML to JSX page on the React website (http://facebook.github.io/react/html-jsx.html)

I've hotlinked it from the Github site for that project since this was the easiest way to pull it in.

Due to the fact that Github Pages lacks redirects (among other basic web hosting functionality), I've replaced the `html-jsx-lib.js` file with a comment explaining where the file has moved to, just in case anyone was hotlinking it from the React site.
2014-09-06 22:51:52 -07:00
Simon Welsh 611abfbcb7 Correct highlighted block 2014-09-06 20:46:19 +10:00
Rick Beerendonk 34b4ed7316 Update video.md with Forward JS 2014 talk
Added "React and Flux: Building Applications with a Unidirectional Data Flow" by Bill Fisher and Jing Chen.
2014-09-06 11:33:36 +02:00
Paul O’Shannessy ce014a00a5 Merge pull request #2148 from nordstrom-innovation/docfix
corrected highlighted/updated line in tutorial example
2014-09-05 10:59:24 -07:00