Skip to content

Sync with reactjs.org @ 1becaff6#230

Merged
vldmrkl merged 32 commits intomasterfrom
sync-1becaff6
Sep 22, 2020
Merged

Sync with reactjs.org @ 1becaff6#230
vldmrkl merged 32 commits intomasterfrom
sync-1becaff6

Conversation

@reactjs-translation-bot
Copy link
Copy Markdown
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Sep 21, 2020

This PR was automatically generated.

Merge changes from reactjs.org at 1becaff

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.

safarishi and others added 30 commits August 18, 2020 22:26
Remove a trailing slash in link which was causing redirect to a not found page.
* Upgrade gatsby-remark-code-repls

* fix path issue on Windows

Gatsby uses `slash` to normalize paths. Because of this `path.join` causes an issue on Windows
Co-authored-by: Sebastian Silbermann <silbermann.sebastian@gmail.com>
…s (#866)

Co-authored-by: Edgar Muentes <Edgar.Muentes@aexp.com>
Co-authored-by: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Co-authored-by: 宋文强 <pwnn@users.noreply.github.com>
Co-authored-by: Eduard Poracký <eporacky@trionyx.sk>
Co-authored-by: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Prefixed `unstable_` for the experimental ReactDOM.createRoot().
* Update blog post for RC1

* Update 2020-08-10-react-v17-rc.md
Disclaimer: I'm an organiser of React Summit, React Advanced London and React Day Berlin - changes proposed in this PR is a small effort to actualise the list of events next to updating our own event dates

Next to updating own conference dates, I've made following changes:

* Removed 2020 events that, based on the current information from their websites, are cancelled or postponed without a new date
* Moved 2020 events that have actually ran to the "past events" section
* Updated dates of some events in 2020 that have not announced their cancellation, but moved dates within this year

What I didn't do:

* I haven't added 2020 cancelled events with their assumed 2021 dates, as it's up to organizers to confirm those and re-add
* To stay consistent with point above - I'm also not adding our (GitNation - React Summit, React Advanced) cancelled event dates that moved to 2021
* Conferences that have a past dates, but has not clear statement on the website about cancellation have not been removed, but rather moved to "past events" section

The information is relevant as of today's date - during these hard times plans do change frequently, so some information may be outdated by the time this PR is merged. I'll be happy to provide amends until it's merged.
…… (#3159)

* Updating the docs to reflect the fact that React.memo can be used with both class and functional components

* removed misleading para
* Fix Navbar covering heading while using anchor in docs

* reduced number of lines of code from 2 to 1

* Forgot to do tests before. Have done those now with no errors
Co-authored-by: Sebastian Silbermann <silbermann.sebastian@gmail.com>
@netlify
Copy link
Copy Markdown

netlify Bot commented Sep 21, 2020

Deploy preview for uk-reactjs ready!

Built with commit 512f1cd

https://deploy-preview-230--uk-reactjs.netlify.app

@vldmrkl vldmrkl merged commit 9a93114 into master Sep 22, 2020
@vldmrkl vldmrkl deleted the sync-1becaff6 branch September 22, 2020 01:51
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.