Skip to content

Sync with reactjs.org @ 3846b501 #180

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.

Sign up for GitHub

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 9 commits into from
Nov 5, 2019
Merged

Sync with reactjs.org @ 3846b501 #180

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
44fbda5
Add v16.11 to versions (#2512)
jamesmckenzie Oct 28, 2019
c2d0cf2
Update for 16.11.0
lex111 Oct 28, 2019
cee0064
Add Detroit React User Group to list of meetups (#2521)
eruby94 Oct 30, 2019
1c7ca3b
Add indonesia react meetup (#2525)
bangun-jds Nov 4, 2019
9fdcbc2
Fix small typo in concurrent-mode-suspense.md (#2529)
ElRatonDeFuego Nov 4, 2019
61b0f0e
Added React Day Bangalore (#2527)
akiran Nov 4, 2019
3846b50
Add more Brazil react meetups (#2518)
lucianomlima Nov 4, 2019
1a64c6b
merging all conflicts
reactjs-translation-bot Nov 4, 2019
00eb0df
Resolve merge conflict
taehwanno Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions content/community/conferences.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ April 23 - 24, 2020 in Kraków, Poland

[Website](http://appjs.co/react) - [Twitter](https://twitter.com/appjsconf)

### React Day Bangalore 2020 {#react-day-bangalore-2020}
April 25, 2020 in Bangalore, India

[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn)

### render(ATL) 2020 {#render-atlanta-2020}
May 4-6, 2020. Atlanta, GA, USA.

Expand Down
10 changes: 10 additions & 0 deletions content/community/meetups.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,14 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
## Brazil {#brazil}
* [Belo Horizonte](https://www.meetup.com/reactbh/)
* [Curitiba](https://www.meetup.com/pt-br/ReactJS-CWB/)
* [Florianópolis](https://www.meetup.com/pt-br/ReactJS-Floripa/)
* [Goiânia](https://www.meetup.com/pt-br/React-Goiania/)
* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
* [Juiz de Fora](https://www.meetup.com/pt-br/React-Juiz-de-Fora/)
* [Maringá](https://www.meetup.com/pt-BR/React-Maringa/)
* [Porto Alegre](https://www.meetup.com/pt-BR/React-Porto-Alegre/)
* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
* [Salvador](https://www.meetup.com/pt-BR/ReactSSA)
* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
* [Vila Velha](https://www.meetup.com/pt-BR/React-ES/)

Expand Down Expand Up @@ -75,6 +81,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
* [Jaipur](https://www.meetup.com/JaipurJS-Developer-Meetup/)

## Indonesia {#indonesia}
* [Indonesia](https://www.meetup.com/reactindonesia/)

## Ireland {#ireland}
* [Dublin](https://www.meetup.com/ReactJS-Dublin/)

Expand Down Expand Up @@ -137,6 +146,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
* [Chicago, IL - ReactJS](https://www.meetup.com/React-Chicago/)
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)
* [Irvine, CA - ReactJS](https://www.meetup.com/ReactJS-OC/)
* [Kansas City, MO - ReactJS](https://www.meetup.com/Kansas-City-React-Meetup/)
* [Las Vegas, NV - ReactJS](https://www.meetup.com/ReactVegas/)
Expand Down
2 changes: 1 addition & 1 deletion content/docs/concurrent-mode-suspense.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ Suspense answers some questions, but it also poses new questions of its own:

* If some component "suspends", does the app freeze? How to avoid this?
* What if we want to show a spinner in a different place than "above" the component in a tree?
* If we intentionally *want* to show an inconsistent UI for a small period time, can we do that?
* If we intentionally *want* to show an inconsistent UI for a small period of time, can we do that?
* Instead of showing a spinner, can we add a visual effect like "greying out" the current screen?
* Why does our [last Suspense example](https://codesandbox.io/s/infallible-feather-xjtbu) log a warning when clicking the "Next" button?

Expand Down
2 changes: 2 additions & 0 deletions content/versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
- title: '16.11'
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16110-october-22-2019
- title: '16.10.2'
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16102-october-3-2019
- title: '16.10.1'
Expand Down
5 changes: 5 additions & 0 deletions src/site-constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@

// NOTE: We can't just use `location.toString()` because when we are rendering
// the SSR part in node.js we won't have a proper location.
<<<<<<< HEAD
const urlRoot = 'https://ko.reactjs.org';
const version = '16.10.2';
=======
const urlRoot = 'https://reactjs.org';
const version = '16.11.0';
>>>>>>> 3846b501066388c4d0bc84fc8389918d9080d5d2
Copy link
Member

Choose a reason for hiding this comment

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

This must be fixed. I will fix this :)

Copy link
Member

Choose a reason for hiding this comment

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

00eb0df

const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';

export {babelURL, urlRoot, version};