From 4853622a359d1abafb82f37635dd6deb3d5f8287 Mon Sep 17 00:00:00 2001 From: Robert Haritonov Date: Mon, 14 Oct 2019 22:11:50 +0100 Subject: [PATCH 1/8] Add React Summit Amsterdam 2020, and update conf domain (#2423) --- content/community/conferences.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/content/community/conferences.md b/content/community/conferences.md index 0e129a5b2..a18c66ad1 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -37,6 +37,11 @@ February 27 & 28, 2020 in Sydney, Australia [Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/) +### React Summit Amsterdam 2020 {#react-summit-2020} +April 15-17, 2020 in Amsterdam, The Netherlands + +[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences) + ### Render-Atlanta 2020 {#render-atlanta-2020} May 4-6, 2020. Atlanta, GA, USA. @@ -90,7 +95,7 @@ February 22 & 23 in San Francisco, CA ### React Amsterdam 2016 {#react-amsterdam-2016} April 16 in Amsterdam, The Netherlands -[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences) +[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences) ### ReactEurope 2016 {#reacteurope-2016} June 2 & 3 in Paris, France @@ -140,7 +145,7 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/) ### React Amsterdam 2017 {#react-amsterdam-2017} April 21st in Amsterdam, The Netherlands -[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences) +[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences) ### ReactEurope 2017 {#reacteurope-2017} May 18th & 19th in Paris, France @@ -245,7 +250,7 @@ March 31 in Kiev, Ukraine ### React Amsterdam 2018 {#react-amsterdam-2018} April 13 in Amsterdam, The Netherlands -[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) +[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) ### React Finland 2018 {#react-finland-2018} April 24-26 in Helsinki, Finland @@ -350,7 +355,7 @@ April 4-5, 2019 in Kraków, Poland ### React Amsterdam 2019 {#react-amsterdam-2019} April 12, 2019 in Amsterdam, The Netherlands -[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences) +[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences) ### React Finland 2019 {#react-finland-2019} April 24-26 in Helsinki, Finland From 378afa448af80a675fc6c8d764c07d34a26b28b0 Mon Sep 17 00:00:00 2001 From: Tom Beckenhauer Date: Wed, 16 Oct 2019 03:51:26 -0400 Subject: [PATCH 2/8] Update meetups.md (#2439) --- content/community/meetups.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/community/meetups.md b/content/community/meetups.md index 074440cff..78bcf1dd6 100644 --- a/content/community/meetups.md +++ b/content/community/meetups.md @@ -131,6 +131,8 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/) * [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/) * [Boston, MA - React Native](https://www.meetup.com/Boston-React-Native-Meetup/) +* [Charlotte, NC - ReactJS](https://www.meetup.com/ReactJS-Charlotte/) +* [Charlotte, NC - React Native](https://www.meetup.com/cltreactnative/) * [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/) From d303b08c19bc7a01055c0cf30055329ab1645644 Mon Sep 17 00:00:00 2001 From: Adebayo Ilerioluwa <46798106+adebayoileri@users.noreply.github.com> Date: Thu, 17 Oct 2019 19:20:58 +0100 Subject: [PATCH 3/8] Update conferences.md (#2445) Added reactsummit from nigeria --- content/community/conferences.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/content/community/conferences.md b/content/community/conferences.md index a18c66ad1..77ccf89d2 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -12,6 +12,11 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c ## Upcoming Conferences {#upcoming-conferences} +### React Summit 2019 {#reactsummit2019} +November 30, 2019 in Lagos, Nigeria + +[Website](https://reactsummit2019.splashthat.com) -[Twitter](https://twitter.com/react_summit) + ### React Conf 2019 {#react-conf-2019} October 24-25, 2019 in Henderson, Nevada USA From c26e34d68927e18a46447eb0f56b678c6d2958f9 Mon Sep 17 00:00:00 2001 From: mvikrammenon Date: Thu, 17 Oct 2019 16:25:55 -0700 Subject: [PATCH 4/8] Updated URL with page section (#2446) --- content/docs/uncontrolled-components.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/uncontrolled-components.md b/content/docs/uncontrolled-components.md index 10b6eab28..54b729e96 100644 --- a/content/docs/uncontrolled-components.md +++ b/content/docs/uncontrolled-components.md @@ -4,7 +4,7 @@ title: Uncontrolled Components permalink: docs/uncontrolled-components.html --- -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. +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. 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. From 1e44de0ef05fac41d60f0716323a1e95a9703af4 Mon Sep 17 00:00:00 2001 From: Eugene Stepnov Date: Sat, 19 Oct 2019 11:23:41 +0300 Subject: [PATCH 5/8] Update tool-ui-component.md (#2447) Add a link to Flatlogic React admin templates. --- content/community/tools-ui-components.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/tools-ui-components.md b/content/community/tools-ui-components.md index fe3d4953d..7b0e59ce9 100644 --- a/content/community/tools-ui-components.md +++ b/content/community/tools-ui-components.md @@ -82,3 +82,4 @@ permalink: community/ui-components.html * **[KendoReact](https://www.telerik.com/kendo-react-ui/)**: UI for React Developers. * **[Mobiscroll React UI Components](https://mobiscroll.com/react)** Mobile UI Controls for the Productive React Developer. * **[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. +* **[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. From b18fc408802b0896e090bb464c711b96b1223422 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Sun, 20 Oct 2019 01:38:56 +0300 Subject: [PATCH 6/8] Specify lang option for gatsby-plugin-manifest --- gatsby-config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gatsby-config.js b/gatsby-config.js index 15ef0a53b..2637eac97 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -163,7 +163,9 @@ module.exports = { resolve: `gatsby-plugin-manifest`, options: { name: 'React Docs', - short_name: 'React', + short_name: 'React', // eg. React [%LANG_CODE%] + // Translators: please change this and two above options (see https://www.gatsbyjs.org/packages/gatsby-plugin-manifest/#feature-configuration---optional) + lang: 'en', start_url: '/', background_color: '#20232a', theme_color: '#20232a', From d2ade76cce133af47ab198188fa2de03fa51834b Mon Sep 17 00:00:00 2001 From: Arshita Kakkar Date: Mon, 21 Oct 2019 17:23:45 +0530 Subject: [PATCH 7/8] Documentation (#2449) * 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 --- content/docs/getting-started.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/getting-started.md b/content/docs/getting-started.md index 6277444c1..27eb26026 100644 --- a/content/docs/getting-started.md +++ b/content/docs/getting-started.md @@ -46,7 +46,7 @@ You can [add React to an HTML page in one minute](/docs/add-react-to-a-website.h ### Create a New React App {#create-a-new-react-app} -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! +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! As your application grows, you might want to consider a more integrated setup. There are [several JavaScript toolchains](/docs/create-a-new-react-app.html) we recommend for larger applications. Each of them can work with little to no configuration and lets you take full advantage of the rich React ecosystem. @@ -115,7 +115,7 @@ The [React blog](/blog/) is the official source for the updates from the React t You can also follow the [@reactjs account](https://twitter.com/reactjs) on Twitter, but you won't miss anything essential if you only read the blog. -Not every React release deserves its own blog post, but you can find a detailed changelog for every release [in the `CHANGELOG.md` file in the React repository](https://github.com/facebook/react/blob/master/CHANGELOG.md), as well as on the [Releases](https://github.com/facebook/react/releases) page. +Not every React release deserves its own blog post, but you can find a detailed changelog for every release in the [`CHANGELOG.md` file in the React repository](https://github.com/facebook/react/blob/master/CHANGELOG.md), as well as on the [Releases](https://github.com/facebook/react/releases) page. ## Versioned Documentation {#versioned-documentation} From 62f7d34222d59028c88b894ce3731feb4e1ec9ec Mon Sep 17 00:00:00 2001 From: Arshad Kazmi Date: Tue, 22 Oct 2019 00:04:37 +0530 Subject: [PATCH 8/8] Conflicts merged --- content/docs/getting-started.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/content/docs/getting-started.md b/content/docs/getting-started.md index c931b2b53..398df45f4 100644 --- a/content/docs/getting-started.md +++ b/content/docs/getting-started.md @@ -46,11 +46,7 @@ React को धीरे-धीरे ग्रहण करने के ल ### नया React ऐप बनाए {#create-a-new-react-app} -<<<<<<< HEAD जब आप नया React प्रोजेक्ट शुरू करते है, [एक सरल HTML पेज स्क्रिप्ट टैग्स के साथ](/docs/add-react-to-a-website.html) एक उत्तम विकल्प हो सकता है। इसे तैयार करने में सिर्फ एक मिनट लगता है! -======= -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! ->>>>>>> d2ade76cce133af47ab198188fa2de03fa51834b जैसे आपकी एप्लीकेशन बड़ी होती जाती है, आप शायद एक ज़्यादा इंटीग्रेटेड सेटअप इस्तेमाल करना चाहेंगे। ऐसी [बहुत सारी जावास्क्रिप्ट टूलचैन हैं](/docs/create-a-new-react-app.html) जिन्हे हम बड़ी एप्लिकेशनों के साथ इस्तेमाल करने के लिए अनुरोध करते हैं। ये सारे थोड़ी या बिना कॉन्फ़िगरेशन के साथ आपको React के इकोसिस्टम का पूरा इस्तेमाल करने देते है। @@ -119,11 +115,7 @@ React के दस्तावेज़ मानते है की आपक आप ट्विटर पर [@reactjs का अकाउंट](https://twitter.com/reactjs) भी फॉलो कर सकते हैं, लेकिन अगर आप हमारा ब्लॉग पढ़ते हैं तो आप कोई ज़रूरी चीज़ नहीं छोड़ेंगे। -<<<<<<< HEAD हर React रिलीज़ अपने ब्लॉग पोस्ट के लायक नहीं होती है लेकिन हर रिलीज़ का पूरा चेंज लोग आपको [`CHANGELOG.md` फाइल जो React की रिपॉजिटरी में है](https://github.com/facebook/react/blob/master/CHANGELOG.md) या [Release](https://github.com/facebook/react/releases) पेज पर मिल जाएगा। -======= -Not every React release deserves its own blog post, but you can find a detailed changelog for every release in the [`CHANGELOG.md` file in the React repository](https://github.com/facebook/react/blob/master/CHANGELOG.md), as well as on the [Releases](https://github.com/facebook/react/releases) page. ->>>>>>> d2ade76cce133af47ab198188fa2de03fa51834b ## वर्ज़न्ड दस्तावेज़ {#versioned-documentation}