Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Sync with upstream @ 69e44506 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javascript-translate-bot wants to merge 529 commits into master from sync-69e44506
Closed

Conversation

@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Jun 1, 2020

This PR was automatically generated to merge changes from en.javascript.info at 69e4450

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

To merge changes manually (instead of merging this PR):

  1. Add remote upstream that links to the English version (only needs to be done once)
    • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
  2. Commit all current work locally and git checkout master
  3. Pull the recent changes from the English version:
    • git pull upstream master
  4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
    • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
      • git checkout --ours <path>
    • See the diff, what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
    • Then you can examine the changes in upstream and add them manually
  5. When conflicts resolved, commit them and git push origin master

This PR will be closed and replaced with a new one in a few days.

paroche and others added 30 commits February 21, 2020 15:56
Fix minor typo error of 1-js/06-advanced-functions/03-closure/article.md
element.addEventListener(event, handler[, options]); TO element.addEventListener(event, handler, [options]);
Changed "it's" to "its" since that is the correct spelling of the possessive form of "it."
Rephrasing introductory sentences about async iterators and generators.
"allows to" -> "allows us to" (3x)
"we should use `for...loop`" -> "we should use a `for...loop`"
they have no effect on the article's appearance
Number should be 79031234567 not 79035419441
iliakan and others added 26 commits May 18, 2020 09:33
The task has a test with a missing comma. That same comma is missing in the comment, so I'm putting it here as well.
The empty users array was undeclared in the second test, and the object in the first test was missing a comma in its declaration.
correct minor error: "имя" is used in place of "name"
Fixed typos on last Array Methods task.
Cross-origin requests initiated by embedded images and forms actually bring cookies by default. Though it is incorrect to say that all cross-origin requests do not bring credentials by default.
Details on cross-origin requests & credentials
Copy link

CLAassistant commented Jun 1, 2020
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 11 committers have signed the CLA.

✅ kiniggit
✅ iliakan
❌ ekira
❌ mattbaker-digital
❌ lex111
❌ desevoker
❌ Logan-Schelly
❌ ironsoul0
❌ ZYinMD
❌ kumarvaibhav45
❌ GabrieleC
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

AltStyle によって変換されたページ (->オリジナル) /