Skip to content

Sync with upstream @ 0f748275 #115

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
wants to merge 3,054 commits into from
Closed

Conversation

javascript-translate-bot

This PR was automatically generated to merge changes from en.javascript.info at 0f74827

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

Please ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).

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

joaquinelio and others added 30 commits June 18, 2021 05:57

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
transpiler def

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Unnecessary escape characters in cookie.js

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…rties-methods

It looks like code was changed some time ago, but comments didn't change accordingly.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
minor edit to 1-js/05-data-types/02-number/

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
slightly improve clarity of Promise.all()

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Maybe. "Accessors" link

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Typo in Ch 15 Functions

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
update one code comment in 1-js/09-classes/04-private-protected-properties-methods

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
joaquinelio and others added 26 commits January 9, 2022 19:03

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
ms - official international name for millisecond. 1 ms = 1 * 10**(-3) second (or 1e-3). Source : https://en.wikipedia.org/wiki/Metric_prefix .
0.000001 or 1e-6 - it's microsecond. Better name for this variable 'mcs' or 'us'. 'mcs' easier to understand.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Capturing and bubbling allow us to implement one of [the] most powerful event handling patterns

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Minor grammar fix

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix spelling error at line 139: "Lke" to "Like"

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix sentence

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix spelling error

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Add "us" for grammatical reasons

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Added 'the' to first sentence

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
added missing "the"

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
redundant

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix sentence

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix grammar

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Nullish coalescing and logical OR both eqaul to 4 now in MDN table.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…g-tests

fix:Add missing test issue:#2826 & fix related solution

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Correction to precedence levels
@CLAassistant
Copy link

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

✅ joaquinelio
✅ odsantos
✅ iliakan
✅ lankerened
❌ Ilya Kantor
❌ NickFallman
❌ tburette
❌ tathienphuoc
❌ yasledesma
❌ kk-source
❌ chrisbarbas
❌ bookchiq
❌ 11201010
❌ Omid-Heidarzadeh
❌ erolaliyev
❌ ArSn


Ilya Kantor seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet