prod_temp (resolved merge conflicts w/main) -> prod #60
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
fix: made the world logo be in a code block to format how it is supposed to be.
…amp#47014) Update 60f85a62fb30c80bcea0cedb.md Co-authored-by: Shivam <shivammadlani5@gmail.com>
* Updated italian/meta-tags.json * Added keywords
…mp#47004) * feat: add some description for secure multiplayer project * Apply suggestions from code review Co-authored-by: Shaun Hamilton <shauhami020@gmail.com> Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
* fix:clarify instructions for catphotoapp step 6 * Update curriculum/challenges/english/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dc23991f86c76b9248c6eb8.md I originally had this as two sentences any way. Co-authored-by: Jeremy L Thompson <jeremy@jeremylt.org> Co-authored-by: Jeremy L Thompson <jeremy@jeremylt.org>
Co-authored-by: Alex Maldonado <alex@Alexs-MBP-2021.home>
* test: utils index is updated to ts * chore: utils.js is added into the .gitignore and .prettierignore
* fix(docs): Fixed Typo in language lead handbook * docs: Updated docs language-lead-handbook updated line 269 making it more concise as suggested. Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com> * Adding cooo-author Co-authored-by: Hrittik Garain <84389562+hrittik2002@users.noreply.github.com> * revert the file back Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com> Co-authored-by: Sboonny <muhammed@freecodecamp.org> Co-authored-by: Hrittik Garain <84389562+hrittik2002@users.noreply.github.com>
…nt (freeCodeCamp#47027) * fix: made the world logo be in a code block to format how it is supposed to be. * Fixed link redirecting to dangerous website The example url that was provided was redirecting to dangerous websites if it was searched. Changed the wording of the example link to hopefully prevent this issue. * fix: Changed url to "example.com" * Fix: changed the english version to have safe link * Reverting the unimportant commit. * Reverting change on the translated file
* docs: swap example pr title * typo
…reeCodeCamp#47034) fix(curriculum): fix hint to match its test
* docs: add challenge-editor instructions * chore: apply sboonny's review suggestions Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org> Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org>
* chore: make curriculum helpers external * feat: add curriculum helpers as a package * fix: use right preset? * fix: update version with babel transpiled files * fix: re-add fixture * fix: declare as module * fix: add declaration files in curriculum helpers * fix: nothing with version 1.0.4 * fix: missing functions in package * fix: remove old babel * fix: linting
* fix: update helmet text * fix: update bcrypt text
* fix: update pug related text * fix: update passport and express-session text * fix: update mongodb text * fix: update passport-local text * fix: update bcrypt text * fix: update passport-github text * fix: update socket.io text * fix: passport.socketio, connect-mongo, and cookie-parser text
…47020) * feat: move example from step 34 to step 35 rothko * change wording
…o app project (freeCodeCamp#47019) * fix: remove requirement for space before text * Apply suggestions from code review
Update _theme.css Inconsistent Spacing in the code lines.
…amp#47017) * fix: add test against wrong code * feat: add mention of option elements
* fix: allow HTML multiline tag syntax * Update curriculum/challenges/english/14-responsive-web-design-22/learn-basic-css-by-building-a-cafe-menu/5f332a88dc25a0fd25c7687a.md Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org> Co-authored-by: Muhammed Mustafa <muhammed@freecodecamp.org>
* feat: update mobile app superblock order * fix: keep old rwd on second row
…CodeCamp#47405) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: =?UTF-8?q?Lasse=20J=C3=B8rgensen?= <28780271+lasjorg@users.noreply.github.com>
* fix(curriculum): explain media queries * Update curriculum/challenges/english/14-responsive-web-design-22/learn-responsive-web-design-by-building-a-piano/612ebcba99bfa46a15370b11.md Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com> Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com>
* feat: add lang code to iframe * feat: apply Naomi's code review Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com> * fix: Iframe title test * Apply suggestions from code review Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com> * fix: hopefully things make sense * fix: steal sem's idea for DOMParser * fix: make the solution work on the main frame Co-authored-by: Naomi Carrigan <nhcarrigan@gmail.com> Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
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.
This PR merges all the conflict resolutions from the main branch of the freecodecamp fork.