Skip to content

Sync with upstream @ 69e44506#51

Merged
3imed-jaberi merged 48 commits into
masterfrom
sync-69e44506
Jun 8, 2020
Merged

Sync with upstream @ 69e44506#51
3imed-jaberi merged 48 commits into
masterfrom
sync-69e44506

Conversation

@javascript-translate-bot

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

Copy link
Copy Markdown

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.

RyanAmeri and others added 30 commits May 2, 2020 07:29
true || alert("printed")
false || alert("not printed") 

This is confusing to a student as the first won't be printed, but the second will print "not printed". I've reversed it to this so it makes much more sense to a learner:

true || alert("not printed")
false || alert("printed")
minor grammar mistake "it's original" should be "its original"
Updated to show Edge now supports BigInt
Fix Typo in logical operators
Add additional error type-checking examples and use `instanceof` in examples
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.
ironsoul0 and others added 11 commits May 25, 2020 13:09
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
@CLAassistant

CLAassistant commented Jun 1, 2020

Copy link
Copy Markdown

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.
3 out of 14 committers have signed the CLA.

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

@3imed-jaberi 3imed-jaberi changed the title Sync with upstream @ 69e44506 Sync with upstream @ 69e44506 [WIP] Jun 8, 2020

@3imed-jaberi 3imed-jaberi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ready to Merge 🚀

@3imed-jaberi 3imed-jaberi changed the title Sync with upstream @ 69e44506 [WIP] Sync with upstream @ 69e44506 Jun 8, 2020
@3imed-jaberi 3imed-jaberi merged commit 083ebd4 into master Jun 8, 2020
@3imed-jaberi 3imed-jaberi deleted the sync-69e44506 branch June 8, 2020 01:01

@OmarioHassan OmarioHassan 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.

Perfect

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.