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

recommitting files due to branch conflict. All PR changes reflected #117

Merged
merged 25 commits into from
Oct 2, 2024
Merged

recommitting files due to branch conflict. All PR changes reflected #117

merged 25 commits into from
Oct 2, 2024

Commits on Oct 1, 2024

  1. recommitting files due to branch conflict. All PR changes reflected

    @marleomac3
    marleomac3 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    7dc5f77 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. feat: adds Dasia's quiz questions (code-differently#114) 

    * feat: Dasia quizz questions

* fix: duplicate declaration

* Fix: capitalization

* Forgot to delete a line

* duplicate name
    @Dasiame @marleomac3
    Dasiame authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    d587d16 View commit details
    Browse the repository at this point in the history

  2. feat: create test questions for Angie (code-differently#109) 

    * answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
    @angie-3 @anthonydmays @marleomac3
    2 people authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    53fded3 View commit details
    Browse the repository at this point in the history

  3. feat: added Xavier's quiz questions (code-differently#99) 

    * feat: added some quiz questions

* Update quizzes.module.ts

* Update quizzes.module.ts
    @XavierCruz5106 @marleomac3
    XavierCruz5106 authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    b2937cc View commit details
    Browse the repository at this point in the history

  4. feat: adds html README for Chelsea (code-differently#118) 

    * Create chelseaogbonnia's readme

* Update and rename lesson_00/chelseaogbonnia to lesson_00/chelsea_ogbonnia/ReadME.md

* Rename ReadME.md to README.md

* Create style.css

The CSS file to make my HTML look like a Github markdown.

* Created index.html

This is the markdown-to-html file with semantic html practice.

* Commit Message: Testing

* chore: remove invalid files

Signed-off-by: Anthony D. Mays <[email protected]>

* Delete lesson_02/lib/typescript/codedifferently-instructional/package-lock.json

---------

Signed-off-by: Anthony D. Mays <[email protected]>
Co-authored-by: Anthony D. Mays <[email protected]>
Co-authored-by: Anthony D. Mays <[email protected]>
    @Cogbonnia @anthonydmays @marleomac3
    3 people authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    67bfc8e View commit details
    Browse the repository at this point in the history

  5. feat: adds Dasia's quiz questions (code-differently#114) 

    * feat: Dasia quizz questions

* fix: duplicate declaration

* Fix: capitalization

* Forgot to delete a line

* duplicate name
    @Dasiame @marleomac3
    Dasiame authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    cca45ee View commit details
    Browse the repository at this point in the history

  6. feat: create test questions for Angie (code-differently#109) 

    * answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
    @angie-3 @anthonydmays @marleomac3
    2 people authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    86eefee View commit details
    Browse the repository at this point in the history

  7. recommitting files due to branch conflict. All PR changes reflected

    @marleomac3
    marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    959a443 View commit details
    Browse the repository at this point in the history

  8. feat: adds Dasia's quiz questions (code-differently#114) 

    * feat: Dasia quizz questions

* fix: duplicate declaration

* Fix: capitalization

* Forgot to delete a line

* duplicate name
    @Dasiame @marleomac3
    Dasiame authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    9e4d980 View commit details
    Browse the repository at this point in the history

  9. feat: create test questions for Angie (code-differently#109) 

    * answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
    @angie-3 @anthonydmays @marleomac3
    2 people authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    8f94a17 View commit details
    Browse the repository at this point in the history

  10. feat: added Xavier's quiz questions (code-differently#99) 

    * feat: added some quiz questions

* Update quizzes.module.ts

* Update quizzes.module.ts
    @XavierCruz5106 @marleomac3
    XavierCruz5106 authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    abd4a9f View commit details
    Browse the repository at this point in the history

  11. attempting to fix merge conflicts

    @marleomac3
    marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    bca32f1 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into lj-lesson-03

    @marleomac3
    marleomac3 authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4100a38 View commit details
    Browse the repository at this point in the history

  13. removed duplicate variable instances

    @marleomac3
    marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4f302ee View commit details
    Browse the repository at this point in the history

  14. recommitting files due to branch conflict. All PR changes reflected

    @marleomac3
    marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    dee729d View commit details
    Browse the repository at this point in the history

  15. removed duplicate hashes from yaml file

    @marleomac3
    marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c984be8 View commit details
    Browse the repository at this point in the history

  16. feat: create test questions for Angie (code-differently#109) 

    * answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
    @angie-3 @anthonydmays @marleomac3
    2 people authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    ee01aad View commit details
    Browse the repository at this point in the history

  17. feat: added Xavier's quiz questions (code-differently#99) 

    * feat: added some quiz questions

* Update quizzes.module.ts

* Update quizzes.module.ts
    @XavierCruz5106 @marleomac3
    XavierCruz5106 authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    3d1156e View commit details
    Browse the repository at this point in the history

  18. feat: create test questions for Angie (code-differently#109) 

    * answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
    @angie-3 @anthonydmays @marleomac3
    2 people authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    8ce28b8 View commit details
    Browse the repository at this point in the history

  19. recommitting files due to branch conflict. All PR changes reflected

    @marleomac3
    marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c8fa0e7 View commit details
    Browse the repository at this point in the history

  20. merge conflicts WIP

    @marleomac3
    marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    67fab66 View commit details
    Browse the repository at this point in the history

  21. feat: added Xavier's quiz questions (code-differently#99) 

    * feat: added some quiz questions

* Update quizzes.module.ts

* Update quizzes.module.ts
    @XavierCruz5106 @marleomac3
    XavierCruz5106 authored and marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    59402e3 View commit details
    Browse the repository at this point in the history

  22. trying to fix yaml merge conflict

    @marleomac3
    marleomac3 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    634cbc9 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'main' into lj-lesson-03

    @marleomac3
    marleomac3 authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    aedcf20 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'main' into lj-lesson-03

    @marleomac3
    marleomac3 authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    9190e13 View commit details
    Browse the repository at this point in the history