Skip to content

Commit 94abdd8

Browse files
lex111robhrt7tbeckenhaueradebayoilerimvikrammenon
authored
Sync with reactjs.org @ d2ade76 (#415)
Sync with reactjs.org @ d2ade76 Co-authored-by: Robert Haritonov <[email protected]> Co-authored-by: Tom Beckenhauer <[email protected]> Co-authored-by: Adebayo Ilerioluwa <[email protected]> Co-authored-by: null <[email protected]> Co-authored-by: Eugene Stepnov <[email protected]> Co-authored-by: Alexey Pyltsyn <[email protected]> Co-authored-by: Arshita Kakkar <[email protected]>
2 parents 0c57dbd + 5b53465 commit 94abdd8

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

content/community/conferences.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15+
### React Summit 2019 {#reactsummit2019}
16+
November 30, 2019 in Lagos, Nigeria
17+
18+
[Website](https://reactsummit2019.splashthat.com) -[Twitter](https://twitter.com/react_summit)
19+
1520
### React Conf 2019 {#react-conf-2019}
1621
October 24-25, 2019 in Henderson, Nevada USA
1722

@@ -37,6 +42,11 @@ February 27 & 28, 2020 in Sydney, Australia
3742

3843
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
3944

45+
### React Summit Amsterdam 2020 {#react-summit-2020}
46+
April 15-17, 2020 in Amsterdam, The Netherlands
47+
48+
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
49+
4050
### Render-Atlanta 2020 {#render-atlanta-2020}
4151
May 4-6, 2020. Atlanta, GA, USA.
4252

@@ -90,7 +100,7 @@ February 22 & 23 in San Francisco, CA
90100
### React Amsterdam 2016 {#react-amsterdam-2016}
91101
April 16 in Amsterdam, The Netherlands
92102

93-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
103+
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
94104

95105
### ReactEurope 2016 {#reacteurope-2016}
96106
June 2 & 3 in Paris, France
@@ -140,7 +150,7 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
140150
### React Amsterdam 2017 {#react-amsterdam-2017}
141151
April 21st in Amsterdam, The Netherlands
142152

143-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
153+
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
144154

145155
### ReactEurope 2017 {#reacteurope-2017}
146156
May 18th & 19th in Paris, France
@@ -245,7 +255,7 @@ March 31 in Kiev, Ukraine
245255
### React Amsterdam 2018 {#react-amsterdam-2018}
246256
April 13 in Amsterdam, The Netherlands
247257

248-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam)
258+
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam)
249259

250260
### React Finland 2018 {#react-finland-2018}
251261
April 24-26 in Helsinki, Finland
@@ -350,7 +360,7 @@ April 4-5, 2019 in Kraków, Poland
350360
### React Amsterdam 2019 {#react-amsterdam-2019}
351361
April 12, 2019 in Amsterdam, The Netherlands
352362

353-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
363+
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
354364

355365
### React Finland 2019 {#react-finland-2019}
356366
April 24-26 in Helsinki, Finland

content/community/meetups.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
131131
* [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/)
132132
* [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/)
133133
* [Boston, MA - React Native](https://www.meetup.com/Boston-React-Native-Meetup/)
134+
* [Charlotte, NC - ReactJS](https://www.meetup.com/ReactJS-Charlotte/)
135+
* [Charlotte, NC - React Native](https://www.meetup.com/cltreactnative/)
134136
* [Chicago, IL - ReactJS](https://www.meetup.com/React-Chicago/)
135137
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
136138
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)

content/community/tools-ui-components.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ permalink: community/ui-components.html
8282
* **[KendoReact](https://www.telerik.com/kendo-react-ui/)**: UI for React Developers.
8383
* **[Mobiscroll React UI Components](https://mobiscroll.com/react)** Mobile UI Controls for the Productive React Developer.
8484
* **[React UI Toolkit](https://react-ui-tools.com/)**: 115+ professionally maintainted UI components ranging from a robust grid to charts and more. Try for FREE and build React apps faster.
85+
* **[Flatlogic React Admin Templates](https://flatlogic.com/templates/react)** 5+ Paid and Free React Admin templates with a lot of components to speed up web development. No jQuery.

content/docs/uncontrolled-components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Неуправляемые компоненты
44
permalink: docs/uncontrolled-components.html
55
---
66

7-
В большинстве случаев при работе с формами мы рекомендуем использовать [управляемые компоненты](/docs/forms.html). В управляемом компоненте, данные формы обрабатываются React-компонентом. В качестве альтернативы можно использовать неуправляемые компоненты. Они хранят данные формы прямо в DOM.
7+
В большинстве случаев при работе с формами мы рекомендуем использовать [управляемые компоненты](/docs/forms.html#controlled-components). В управляемом компоненте, данные формы обрабатываются React-компонентом. В качестве альтернативы можно использовать неуправляемые компоненты. Они хранят данные формы прямо в DOM.
88

99
Вместо того, чтобы писать обработчик события для каждого обновления состояния, вы можете использовать неуправляемый компонент и читать значения из DOM через [реф](/docs/refs-and-the-dom.html).
1010

gatsby-config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ module.exports = {
167167
options: {
168168
name: 'Документация React',
169169
short_name: 'React [RU]',
170+
// Translators: please change this and two above options (see https://www.gatsbyjs.org/packages/gatsby-plugin-manifest/#feature-configuration---optional)
171+
lang: 'ru',
170172
start_url: '/',
171173
background_color: '#20232a',
172174
theme_color: '#20232a',

0 commit comments

Comments
 (0)