Skip to content

Sync with reactjs.org @ 1f2dbb7a - #285

Merged
gcor merged 25 commits into
masterfrom
sync-1f2dbb7a
Apr 2, 2019
Merged

Sync with reactjs.org @ 1f2dbb7a#285
gcor merged 25 commits into
masterfrom
sync-1f2dbb7a

Conversation

@reactjs-translation-bot

@reactjs-translation-botreactjs-translation-bot commented Mar 22, 2019

Copy link
Copy Markdown
Contributor

This PR was automatically generated.

Merge changes from reactjs.org at 1f2dbb7

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.

BrianMitchLand others added 6 commits March 18, 2019 10:24
@BrianMitchL@alexkrolick
Add React Rally 2019 (#1840)
905a113
@gaearon
Add a DOM measurement recipe to Hooks FAQ (#1843)
806da34
* Add a DOM measurement recipe to Hooks FAQ
* Update content/docs/hooks-faq.md
Co-Authored-By: gaearon <dan.abramov@gmail.com>
* Update content/docs/hooks-faq.md
Co-Authored-By: gaearon <dan.abramov@gmail.com>
@gaearon
Add more explanations to Hooks API page (#1845)
ac4aa65
* Add more explanations to API page
* static
* add info about useLayoutEffect
* Update content/docs/hooks-reference.md
Co-Authored-By: gaearon <dan.abramov@gmail.com>
* nits
* nit
@gaearon
Document useContext bailout strategy (#1848)
b1bc193
@tesseralis
Update languages for Simplified Chinese completion (#1854)
1f2dbb7
* Update languages for Simplified Chinese completion
* Update languages.yml
@reactjs-translation-bot
merging all conflicts
aad51f2
@netlify

netlifyBot commented Mar 22, 2019•
edited
Loading

Copy link
Copy Markdown

Deploy preview for ru-reactjs ready!

Built with commit ce39f1d

https://deploy-preview-285--ru-reactjs.netlify.com

This was referenced Mar 22, 2019
Closed
Closed
@gcor

gcor commented Mar 23, 2019

Copy link
Copy Markdown
Contributor

#286

@another-guyanother-guy mentioned this pull request Mar 26, 2019
Merged
gcor
gcor reviewed Apr 1, 2019
View reviewed changes
Comment threadcontent/docs/hooks-reference.md Outdated
Comment threadcontent/docs/hooks-reference.md Outdated
@gcor

gcor commented Apr 1, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

@ntishkevich посмотришь этот реквест?
Я перевод сделал в #286 реквесте (там же английский оригинал) и сюда притянул, не знаю нормально ли это или нет.

lex111
lex111 reviewed Apr 2, 2019
View reviewed changes

@lex111lex111 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@gcor спасибо за обновление! Можно смело править мои предложения или вносить изменения, т.е. не ждать моей реакции, чтобы как можно быстрее принять это обновление, потому что итак сильно затянули.

Comment threadcontent/docs/hooks-faq.md Outdated
Comment threadcontent/docs/hooks-faq.md Outdated
Comment threadcontent/docs/hooks-faq.md Outdated
Comment threadcontent/docs/hooks-faq.md Outdated
Comment threadcontent/docs/hooks-faq.md Outdated
Comment threadcontent/docs/hooks-reference.md Outdated
Comment threadcontent/docs/hooks-reference.md Outdated
Comment threadcontent/docs/hooks-reference.md Outdated
Comment threadcontent/docs/hooks-reference.md Outdated
Comment threadcontent/docs/hooks-reference.md Outdated
lex111and others added 6 commits April 2, 2019 09:53
@lex111@gcor
Update content/docs/hooks-faq.md
4ae90f6
Co-Authored-By: gcor <anton@gcor.ru>
@lex111@gcor
Update content/docs/hooks-faq.md
c50331e
Co-Authored-By: gcor <anton@gcor.ru>
@lex111@gcor
Update content/docs/hooks-faq.md
2d37a5e
Co-Authored-By: gcor <anton@gcor.ru>
@lex111@gcor
Update content/docs/hooks-reference.md
ba24f1d
Co-Authored-By: gcor <anton@gcor.ru>
@lex111@gcor
Update content/docs/hooks-reference.md
42d54fd
Co-Authored-By: gcor <anton@gcor.ru>
@lex111@gcor
Update content/docs/hooks-reference.md
402c0a9
Co-Authored-By: gcor <anton@gcor.ru>
lex111and others added 6 commits April 2, 2019 09:54
@gcor
gcor merged commit 9c6f689 into masterApr 2, 2019
@lex111
lex111 deleted the sync-1f2dbb7a branch April 2, 2019 10:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@another-guyanother-guyAwaiting requested review from another-guy
@gaearongaearonAwaiting requested review from gaearon
2 more reviewers
@lex111lex111lex111 left review comments
@gcorgcorgcor left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@reactjs-translation-bot@gcor@lex111@BrianMitchL@gaearon@tesseralis