Skip to content

Sync with reactjs.org @ d2ade76c #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Oct 27, 2019
Merged

Sync with reactjs.org @ d2ade76c #260

merged 19 commits into from
Oct 27, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Oct 21, 2019

This PR was automatically generated.

Merge changes from reactjs.org at d2ade76

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.

rokibulislaam and others added 18 commits October 7, 2019 11:09
Updated the broken links of  React.js Conf 2016 (February 22 & 23 in San Francisco, CA)
We have recently formalized a group here in the Philippines with the aim to have monthly meetups, study jams, and eventually(hopefully) a conference. We are on our 5th meetup for the year now! ever since we started the core team 5-6 months ago.

I think the other meetup group is inactive as well as the owner left the group to a company.
Alternatively, "`React.Suspense` allows you to specify..."
…ns (#2377)

* manifest config added and src/images/react_logo.png added for icon

* inverted commas fix as per linter

* added legacy:true option for ios

* legacy:true lint fix

* added meta tags for ios and moved logo from src to static
* Add usage example for useContext.

The intent is to show where the hook fits in to the usual Context usage.

* Remove unnecessary comment in code block.
* media query to hide header on print

* add media query to hide footer on print
Added reactsummit from nigeria
Add a link to Flatlogic React admin templates.
* Update getting-started.md

Line 41 - 
When starting a React project, [a simple HTML page with script tags](/docs/add-react-to-a-website.html) might still be the best option. It only takes a minute to set up!
Removed the hyperlink from "a" as we're focusing on simple HTML page so a shouldn't be hyperlinked.

* Update getting-started.md

Closes #2450


Co-authored-by: Alexey Pyltsyn <[email protected]>
@netlify
Copy link

netlify bot commented Oct 21, 2019

Deploy preview for ja-reactjs ready!

Built with commit 5ce17f3

https://deploy-preview-260--ja-reactjs.netlify.com

Copy link
Member

@koba04 koba04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@koba04 koba04 merged commit 7a957cc into master Oct 27, 2019
@koba04 koba04 deleted the sync-d2ade76c branch October 27, 2019 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.