Skip to content

Commit a84e211

Browse files
Merge branch 'master' into create_new_react_app
2 parents a865993 + a45d190 commit a84e211

File tree

6 files changed

+29
-14
lines changed

6 files changed

+29
-14
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/cdn-links.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
---
22
id: cdn-links
3-
title: CDN Links
3+
title: CDN लिंकस
44
permalink: docs/cdn-links.html
55
prev: create-a-new-react-app.html
66
next: hello-world.html
77
---
88

9-
Both React and ReactDOM are available over a CDN.
9+
React एवं ReactDOM दोनों CDN पर उपलब्ध हैं।
1010

1111
```html
1212
<script crossorigin src="https://unpkg.com/react@16/umd/react.development.js"></script>
1313
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script>
1414
```
1515

16-
The versions above are only meant for development, and are not suitable for production. Minified and optimized production versions of React are available at:
16+
उपरोक्त वर्शन केवल डेवलपमेंट के लिए हैं, एवं प्रोडक्शन के लिए उपयुक्त नहीं हैं। React के minified एवं ऑप्टीमाइज़्ड प्रोडक्शन वर्शन निम्नलिखित लिंक पर उपलब्ध हैं:
1717

1818
```html
1919
<script crossorigin src="https://unpkg.com/react@16/umd/react.production.min.js"></script>
2020
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"></script>
2121
```
2222

23-
To load a specific version of `react` and `react-dom`, replace `16` with the version number.
23+
`react` एवं `react-dom` के विशिष्ट वर्शन लोड करने के लिए `16` को वर्शन संख्या द्वारा बदल दें।
2424

25-
### Why the `crossorigin` Attribute? {#why-the-crossorigin-attribute}
25+
### `crossorigin` एट्रीब्यूट क्यों? {#why-the-crossorigin-attribute}
2626

27-
If you serve React from a CDN, we recommend to keep the [`crossorigin`](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) attribute set:
27+
यदि आप React को CDN द्वारा प्रसारित करते हैं, हमारा सुझाव है कि आप [`crossorigin`](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) एट्रीब्यूट सेट को न हटाएं:
2828

2929
```html
3030
<script crossorigin src="..."></script>
3131
```
3232

33-
We also recommend to verify that the CDN you are using sets the `Access-Control-Allow-Origin: *` HTTP header:
33+
हमारा यह भी सुझाव है कि आप सुनिश्चित कर लें जिस CDN का आप उपयोग कर रहे हैं वह `Access-Control-Allow-Origin: *` HTTP हेडर सेट करता है:
3434

3535
![Access-Control-Allow-Origin: *](../images/docs/cdn-cors-header.png)
3636

37-
This enables a better [error handling experience](/blog/2017/07/26/error-handling-in-react-16.html) in React 16 and later.
37+
ऐसा करने से React 16 एवं बाद के वर्शन में [बेहतर एरर नियंत्रण](/blog/2017/07/26/error-handling-in-react-16.html) होता है।

content/docs/uncontrolled-components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Uncontrolled Components
44
permalink: docs/uncontrolled-components.html
55
---
66

7-
In most cases, we recommend using [controlled components](/docs/forms.html) to implement forms. In a controlled component, form data is handled by a React component. The alternative is uncontrolled components, where form data is handled by the DOM itself.
7+
In most cases, we recommend using [controlled components](/docs/forms.html#controlled-components) to implement forms. In a controlled component, form data is handled by a React component. The alternative is uncontrolled components, where form data is handled by the DOM itself.
88

99
To write an uncontrolled component, instead of writing an event handler for every state update, you can [use a ref](/docs/refs-and-the-dom.html) to get form values from the DOM.
1010

gatsby-config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,9 @@ module.exports = {
163163
resolve: `gatsby-plugin-manifest`,
164164
options: {
165165
name: 'React Docs',
166-
short_name: 'React',
166+
short_name: 'React', // eg. React [%LANG_CODE%]
167+
// Translators: please change this and two above options (see https://www.gatsbyjs.org/packages/gatsby-plugin-manifest/#feature-configuration---optional)
168+
lang: 'en',
167169
start_url: '/',
168170
background_color: '#20232a',
169171
theme_color: '#20232a',

0 commit comments

Comments
 (0)