Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Javascript -> JavaScript (English) #35183

Merged
merged 5 commits into from Mar 28, 2019
Merged

Javascript -> JavaScript (English) #35183

merged 5 commits into from Mar 28, 2019

Conversation

lipis
Copy link
Contributor

@lipis lipis commented Feb 13, 2019 •
edited

  • I have read freeCodeCamp's contribution guidelines.
  • My pull request has a descriptive title (not a vague title like Update index.md)
  • My pull request targets the master branch of freeCodeCamp.
  • None of my changes are plagiarized from another source without proper attribution.
  • All the files I changed are in the same world language (for example: only English changes, or only Chinese changes, etc.)
  • My changes do not use shortened URLs or affiliate links.

Closes #XXXXX

@lipis lipis requested a review from a team February 13, 2019 09:28
@lipis lipis mentioned this pull request Feb 13, 2019
Closed
11 tasks
@raisedadead raisedadead requested review from RandellDawson and removed request for a team February 13, 2019 18:08
@RandellDawson
Copy link
Member

@raisedadead I had planned on reviewing this one. Can you add your commentary on issue #35185 ?

@RandellDawson RandellDawson self-assigned this Feb 13, 2019
@RandellDawson
Copy link
Member

RandellDawson commented Feb 13, 2019 •
edited

@lipis There are 104 earlier PRs which have changes on one or more of the files on this PR, so this will take a long time to review these. In the future, try to limit your changes so that the max number of file changes are 50 or less. I understand this is not always possible, but it would make it easier for us to get merge PRs with many file changes. Right now, there are so many PRs which have not been reviewed which touch the same files. For now, do split this PR into fewer files affected. I will slowly work my way through the other PRs.

@camperbot camperbot added language: English scope: curriculum Lessons, Challenges, Projects and other Curricular Content in curriculum directory. labels Feb 13, 2019
@lipis lipis changed the title Replaced: Javascript -> JavaScript, Typescript -> TypeScript (English) Javascript -> JavaScript (English) Feb 14, 2019
@lipis
Copy link
Contributor Author

lipis commented Feb 14, 2019

Removed Typescript from this PR.. but Javascript for English still affects many files..

@RandellDawson
Copy link
Member

@lipis I made a mistake in my last reply. I meant to say do not split this PR, but instead I said do split. We had already started working on the earlier PRs which would have needed reviewing to get this PR merged. It was my mistake, so at this point, we will leave them split and I will make a new list of earlier PRs to work through. This will not take me long at all so don't worry.

@lynxlynxlynx lynxlynxlynx added the status: merge conflict To be applied to PR's that have a merge conflict and need updating label Mar 17, 2019
@thecodingaviator
Copy link
Contributor

We have so many merge conflicts on this PR that I don't think that it is worth the pain to work them out. IMO pulling a fresh copy of the fCC master branch and then doing all replacements again is better. What do you think @RandellDawson ?

@RandellDawson
Copy link
Member

RandellDawson commented Mar 27, 2019 •
edited

@thecodingaviator No don't worry, I will take care of them. I already reviewed this PR when it was first created and validated all the original ones were valid changes.

@RandellDawson RandellDawson removed the status: merge conflict To be applied to PR's that have a merge conflict and need updating label Mar 27, 2019
thecodingaviator
thecodingaviator approved these changes Mar 27, 2019
View reviewed changes
Copy link
Contributor

@thecodingaviator thecodingaviator left a comment

Choose a reason for hiding this comment

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

LGTM! 👍

@thecodingaviator thecodingaviator merged commit e84ae45 into freeCodeCamp:master Mar 28, 2019
@thecodingaviator
Copy link
Contributor

@lipis Thank you for your contribution to the page! 👍
We're happy to accept these changes, and look forward to future contributions. 📝

@lipis lipis deleted the js-english branch April 5, 2019 21:22
@SC0T1ISHNiNjA SC0T1ISHNiNjA mentioned this pull request Nov 30, 2023
Open
@zzx4998 zzx4998 mentioned this pull request Nov 30, 2023
Open
@kaocher82 kaocher82 mentioned this pull request Dec 1, 2023
Open
@ajesse11x ajesse11x mentioned this pull request Dec 1, 2023
Open
@MaxMood96 MaxMood96 mentioned this pull request Dec 1, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thecodingaviator thecodingaviator thecodingaviator approved these changes

@RandellDawson RandellDawson Awaiting requested review from RandellDawson

Assignees

@RandellDawson RandellDawson

Labels
scope: curriculum Lessons, Challenges, Projects and other Curricular Content in curriculum directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lipis @RandellDawson @thecodingaviator @lynxlynxlynx @camperbot