Skip to content

TCA-524 Merge latest from FCC/main -> dev #99

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

Merged
merged 222 commits into from
Dec 9, 2022
Merged

TCA-524 Merge latest from FCC/main -> dev #99

merged 222 commits into from
Dec 9, 2022

Conversation

vas3a
Copy link
Collaborator

@vas3a vas3a commented Dec 7, 2022

Syncs latest changes from FCC/main

renovate bot and others added 30 commits October 29, 2022 04:41
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
)

Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com>
Co-authored-by: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org>
Co-authored-by: Tom <20648924+moT01@users.noreply.github.com>
Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com>
Co-authored-by: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
…reeCodeCamp#48255)

fix: update description of build a city skyline step 71

Co-authored-by: Sem Bauke <semboot699@gmail.com>
…reeCodeCamp#48280)

* fix(curriculum): describe different browser behavior

* Update curriculum/challenges/english/01-responsive-web-design/responsive-web-design-projects/build-a-survey-form.md

Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com>

* Update curriculum/challenges/english/14-responsive-web-design-22/build-a-survey-form-project/build-a-survey-form.md

Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com>

Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com>
renovate bot and others added 17 commits December 5, 2022 02:20
* fix(UI): make 'Tests' translatable

* fix(UI): use existing string
Fixes the spelling of a word in the description of an exercise.
Small improvement to the readability of a sentence
Co-authored-by: Niraj Nandish <nirajnandish@icloud.com>

Co-authored-by: Niraj Nandish <nirajnandish@icloud.com>
* chore: bump prettier and lint-staged

* refactor: drop unused eslint disables

Currently we need to fetch trending.json before we can build the site
(i.e. before Cypress tests can run), so we can assume the file exists.

In case the download fails in CI, linting will error first. I've added
a comment to save some debugging time.

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
@brooketopcoder brooketopcoder changed the title Merge latest from FCC/main -> dev TCA-524 Merge latest from FCC/main -> dev Dec 7, 2022
@brooketopcoder
Copy link

@vas3a Please hold off on merging this until the prod deployment.

@brooketopcoder brooketopcoder merged commit 35de723 into dev Dec 9, 2022
@brooketopcoder brooketopcoder deleted the prod-merge branch December 9, 2022 00:04
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.