TCA-435 merge FCC/main into prod -> prod-merge #77
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ion-form project (freeCodeCamp#47332) * Add files via upload * removed merge conflicts * new step 17 * write step 17 + seed code step 18 * for and id to remaining steps * new step 28 * finish id and for in second fieldset * new step 37 * 37 tests * update seeds and solution * more updating seeds and solution * fixed wrong seed * fixed wrong test * formatting * Apply suggestions from Shaun's code review Co-authored-by: Shaun Hamilton <shauhami020@gmail.com> Co-authored-by: Johnathan Webster <81039525+JohnathanTWebster@users.noreply.github.com> Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
* docs: document how to enable new languages * docs: rename file, update sidebar * docs: include hiddenLangs config
…p#47432) * Changed descriptions of id from properties to attributes * Update curriculum/challenges/english/14-responsive-web-design-22/learn-html-forms-by-building-a-registration-form/62ff8b9dab5ac88e4d3d43a3.md Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org> * Update curriculum/challenges/english/14-responsive-web-design-22/learn-html-forms-by-building-a-registration-form/62ff8e998d3e7eae14d6ae3b.md Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org> * Update curriculum/challenges/english/14-responsive-web-design-22/learn-html-forms-by-building-a-registration-form/62ff919a7b5612c0670923a5.md Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org> Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org>
…reeCodeCamp#47435) Update 5d822fd413a79914d39e9929.md Minor typo Only three more building to go. -> Only three more buildings to go.
Update mutate-an-array-declared-with-const.md Fixed unclear part of the exercise description. As cited by user [in the forum](https://forum.freecodecamp.org/t/cannot-understand-the-following-line-in-question/549786/3)
* feat: add preview popout window * fix: remove unused * fix: add title to window * fix: add preview to window title * feat: it works * chore: clean up * chore: more clean up * fix: add better screen reader messages
* Added links for the MP3 files Had to go through the trouble of finding audio clips in the source code of the sample project to finish mine. * Apply suggestions from code review Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com> Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com>
* fix: restore keyboard accessibility * fix/ make code easier to maintain
…#47448) * Clarify understand-string-immutability Remove some misleading explanation (immutability is orthogonal to literals). * Remove extraneous whitespace Co-authored-by: Jeremy L Thompson <jeremy@jeremylt.org> * Improve explanation per review suggestion Co-authored-by: Jeremy L Thompson <jeremy@jeremylt.org> Co-authored-by: Jeremy L Thompson <jeremy@jeremylt.org>
add visual seperation in Change language menu UI
…amp#47470) switch second to third
* fix: change the instruction text * fix: make instruction sentence more straightforward Co-authored-by: Jeremy L Thompson <jeremy@jeremylt.org> Co-authored-by: Jeremy L Thompson <jeremy@jeremylt.org>
…lines (freeCodeCamp#47534) fix: replace tabs
…#47552) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
@vas3a Can we create a prod-merge branch based off prod that we can point this PR to? I'd like to be able to test out the merge w/out deploying to production. |
|
@brooketopcoder If you checkout TCA-435-merge-fcc-main-into-prod is based on prod. |
|
@vas3a I was thinking we could merge prod-merge into the dev branch rather than the prod branch. |
brooketopcoder
changed the title
brooketopcoder
approved these changes
Sep 21, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TCA-435
Merge FCC's main branch into our prod branch