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

added database configuration #5

Open
wants to merge 141 commits into
base: main
Choose a base branch
from
Open

added database configuration #5

wants to merge 141 commits into from

Commits on May 2, 2024

  1. Update Readme

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    0752362 View commit details
    Browse the repository at this point in the history

  2. Update

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    6916460 View commit details
    Browse the repository at this point in the history

  3. update

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    3a162d3 View commit details
    Browse the repository at this point in the history

  4. 505

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ae674ed View commit details
    Browse the repository at this point in the history

  5. d

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2f814bb View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    @cdean97
    cdean97 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    b5f6078 View commit details
    Browse the repository at this point in the history

  7. Add files via upload 

    Added logo
    @cdean97
    cdean97 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    2ffba6a View commit details
    Browse the repository at this point in the history

  8. test

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    addbb35 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1 from parkersavage/branch1 

    Add files via upload
    @cdean97
    cdean97 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    16e3268 View commit details
    Browse the repository at this point in the history

  10. put new icons and sidebar label names

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    8903180 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    aea9d03 View commit details
    Browse the repository at this point in the history

  12. Added logo

    @cdean97
    cdean97 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    85ca01f View commit details
    Browse the repository at this point in the history

  13. Merge pull request #2 from parkersavage/PARKER_ONE 

    test
    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    9beb299 View commit details
    Browse the repository at this point in the history

  14. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    69d65e9 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9ebc8e2 View commit details
    Browse the repository at this point in the history

  16. tables

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7a0b8dc View commit details
    Browse the repository at this point in the history

  17. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2185f70 View commit details
    Browse the repository at this point in the history

  18. fix

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9bc4bd0 View commit details
    Browse the repository at this point in the history

  19. Removed Quick Links

    @cdean97
    cdean97 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    02b4be1 View commit details
    Browse the repository at this point in the history

  20. d

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e5dc913 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #3 from parkersavage/parker_2 

    d
    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    f8aa829 View commit details
    Browse the repository at this point in the history

  22. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e874226 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b55be97 View commit details
    Browse the repository at this point in the history

  24. Renamed tables and users to cookbook and pantry

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c56ca32 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7e6b0e2 View commit details
    Browse the repository at this point in the history

  26. changed icon for sidebar of cookbook pantry index

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    f6b777f View commit details
    Browse the repository at this point in the history

  27. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1eac91e View commit details
    Browse the repository at this point in the history

  28. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    765409c View commit details
    Browse the repository at this point in the history

  29. fixed sidebar navigation

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    72907b7 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    3a7b249 View commit details
    Browse the repository at this point in the history

  31. fixed cookbook sidebar navigation

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d037d89 View commit details
    Browse the repository at this point in the history

  32. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9f8bcc6 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c38fc01 View commit details
    Browse the repository at this point in the history

  34. Update pantry.html

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    f63daa3 View commit details
    Browse the repository at this point in the history

  35. Update cookbook.html

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    7517476 View commit details
    Browse the repository at this point in the history

  36. Added profile page

    @cdean97
    cdean97 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    4283d1d View commit details
    Browse the repository at this point in the history

  37. Merge pull request #4 from parkersavage/Parker_Cookbook 

    Parker cookbook
    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    3175f34 View commit details
    Browse the repository at this point in the history

  38. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    23f71a5 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    444eb89 View commit details
    Browse the repository at this point in the history

  40. Added ref to profile page

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    54e41b7 View commit details
    Browse the repository at this point in the history

  41. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    3a16f6c View commit details
    Browse the repository at this point in the history

  42. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    8d24a8f View commit details
    Browse the repository at this point in the history

  43. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    8e67f92 View commit details
    Browse the repository at this point in the history

  44. added database configuration

    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    f4ecd0d View commit details
    Browse the repository at this point in the history

  45. Changed Logo

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2e28dc9 View commit details
    Browse the repository at this point in the history

  46. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    57410c1 View commit details
    Browse the repository at this point in the history

  47. Added sidebar

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1662412 View commit details
    Browse the repository at this point in the history

  48. Profile

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2e6fbb0 View commit details
    Browse the repository at this point in the history

  49. Update index.html

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    d7c3b70 View commit details
    Browse the repository at this point in the history

  50. Merge pull request #5 from parkersavage/Parker 

    Update index.html
    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    a6c4b04 View commit details
    Browse the repository at this point in the history

  51. Merge branch 'main' of https://github.com/parkersavage/NewGroupB into… 

    … SamsBranch

# Conflicts:
#	login.html
    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a75bd6f View commit details
    Browse the repository at this point in the history

  52. Changed dropdown to button

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b2365d9 View commit details
    Browse the repository at this point in the history

  53. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    fc972c0 View commit details
    Browse the repository at this point in the history

  54. Merge branch 'main' of https://github.com/parkersavage/NewGroupB into… 

    … SamsBranch
    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    72b6caf View commit details
    Browse the repository at this point in the history

  55. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    32dedb9 View commit details
    Browse the repository at this point in the history

  56. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2c0b79e View commit details
    Browse the repository at this point in the history

  57. Update index.html

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    caaad6a View commit details
    Browse the repository at this point in the history

  58. Merge pull request #6 from parkersavage/Parker 

    Update index.html
    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    9ecee41 View commit details
    Browse the repository at this point in the history

  59. Update index.html

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    7323a6b View commit details
    Browse the repository at this point in the history

  60. Merge pull request #7 from parkersavage/parker2 

    Update index.html
    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    e022348 View commit details
    Browse the repository at this point in the history

  61. Replaced drop down w/profile button

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    6929a55 View commit details
    Browse the repository at this point in the history

  62. Fixed cookbook header in the page

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4a82752 View commit details
    Browse the repository at this point in the history

  63. Update index.html

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    1292dc6 View commit details
    Browse the repository at this point in the history

  64. Merge pull request #8 from parkersavage/parkersavage-patch-2 

    Update index.html
    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    1504ae5 View commit details
    Browse the repository at this point in the history

  65. Update index.html

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    3f50535 View commit details
    Browse the repository at this point in the history

  66. Update master.css

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    e289584 View commit details
    Browse the repository at this point in the history

  67. Remove JS elements

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c711fb9 View commit details
    Browse the repository at this point in the history

  68. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    906b4de View commit details
    Browse the repository at this point in the history

  69. Reverted

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c43667b View commit details
    Browse the repository at this point in the history

  70. Changed view

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a9b4feb View commit details
    Browse the repository at this point in the history

  71. removed dropdown

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ea4276a View commit details
    Browse the repository at this point in the history

  72. Removed drop down

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2cc367b View commit details
    Browse the repository at this point in the history

  73. added logout button

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    46f0493 View commit details
    Browse the repository at this point in the history

  74. Create t

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    106dd60 View commit details
    Browse the repository at this point in the history

  75. Add files via upload

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    88a61c7 View commit details
    Browse the repository at this point in the history

  76. Create Recipe.js

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    e80bb30 View commit details
    Browse the repository at this point in the history

  77. renamed index to Home

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e107e4a View commit details
    Browse the repository at this point in the history

  78. changed layout

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a7cd4bb View commit details
    Browse the repository at this point in the history

  79. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a8a134a View commit details
    Browse the repository at this point in the history

  80. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c015c08 View commit details
    Browse the repository at this point in the history

  81. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ef1bd21 View commit details
    Browse the repository at this point in the history

  82. Update Home.html

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    48d7422 View commit details
    Browse the repository at this point in the history

  83. added login and register feature with database

    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    917347a View commit details
    Browse the repository at this point in the history

  84. updated to match main

    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1ea3d79 View commit details
    Browse the repository at this point in the history

  85. Merge branch 'main' of https://github.com/parkersavage/NewGroupB into… 

    … SamsBranch

# Conflicts:
#	Home.html
#	login.html
#	profile.html
    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e2b81e2 View commit details
    Browse the repository at this point in the history

  86. updated the database and converted some of the html files to ejs. Typ… 

    …e npm run devStart or node app.js to run it.
    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4d7bbf7 View commit details
    Browse the repository at this point in the history

  87. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e477f1f View commit details
    Browse the repository at this point in the history

  88. added database info file

    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    cafe990 View commit details
    Browse the repository at this point in the history

  89. Merge branch 'main' of https://github.com/parkersavage/NewGroupB into… 

    … SamsBranch
    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    f32371e View commit details
    Browse the repository at this point in the history

  90. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e1c03dd View commit details
    Browse the repository at this point in the history

  91. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ada64ad View commit details
    Browse the repository at this point in the history

  92. A single typo was fixed

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    6237722 View commit details
    Browse the repository at this point in the history

  93. Update README.md

    @parkersavage
    parkersavage authored May 2, 2024
    Configuration menu
    Copy the full SHA
    31d1f65 View commit details
    Browse the repository at this point in the history

  94. Merge branch 'main' of https://github.com/parkersavage/PanTRY

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e8c3c96 View commit details
    Browse the repository at this point in the history

  95. added add-ingredient.ejs file

    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ed5f0c8 View commit details
    Browse the repository at this point in the history

  96. Merge branch 'main' of https://github.com/parkersavage/NewGroupB into… 

    … SamsBranch
    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ca62452 View commit details
    Browse the repository at this point in the history

  97. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    813b724 View commit details
    Browse the repository at this point in the history

  98. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    8c75c92 View commit details
    Browse the repository at this point in the history

  99. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a4c86d3 View commit details
    Browse the repository at this point in the history

  100. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    35b78b6 View commit details
    Browse the repository at this point in the history

  101. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    0497a68 View commit details
    Browse the repository at this point in the history

  102. commit

    @RackyAllen
    RackyAllen committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9f3c06c View commit details
    Browse the repository at this point in the history

  103. Cookbook is basically gone

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b495d3d View commit details
    Browse the repository at this point in the history

  104. Merge branch 'main' of https://github.com/parkersavage/PanTRY

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1777513 View commit details
    Browse the repository at this point in the history

  105. Add files via upload

    @jeepjeep32
    jeepjeep32 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    6cbc0fd View commit details
    Browse the repository at this point in the history

  106. Cookbook is actually gone now

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e7b7598 View commit details
    Browse the repository at this point in the history

  107. Merge branch 'main' of https://github.com/parkersavage/PanTRY

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    404ce48 View commit details
    Browse the repository at this point in the history

  108. Cookbook Fixes

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    5d5e631 View commit details
    Browse the repository at this point in the history

  109. commit

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    96156fc View commit details
    Browse the repository at this point in the history

  110. More cookbook changes

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1094954 View commit details
    Browse the repository at this point in the history

  111. Merge branch 'main' of https://github.com/parkersavage/PanTRY

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    5798ff8 View commit details
    Browse the repository at this point in the history

  112. Deleted sentence about adding things to the tables

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    0e2b8bf View commit details
    Browse the repository at this point in the history

  113. n/a

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    53072f3 View commit details
    Browse the repository at this point in the history

  114. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    07952f8 View commit details
    Browse the repository at this point in the history

  115. Table Title rename

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    dd98b2d View commit details
    Browse the repository at this point in the history

  116. Merge branch 'main' of https://github.com/parkersavage/PanTRY

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    bccfbbe View commit details
    Browse the repository at this point in the history

  117. Changed ID to #

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e5b1eaa View commit details
    Browse the repository at this point in the history

  118. Formatting

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    85f96f8 View commit details
    Browse the repository at this point in the history

  119. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    deffe4a View commit details
    Browse the repository at this point in the history

  120. Comments for Cookbook

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    941d096 View commit details
    Browse the repository at this point in the history

  121. Merge branch 'main' of https://github.com/parkersavage/PanTRY

    @MasonSharum
    MasonSharum committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e3b78eb View commit details
    Browse the repository at this point in the history

  122. add title to home page

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    bc322a5 View commit details
    Browse the repository at this point in the history

  123. add ingredient

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a012b94 View commit details
    Browse the repository at this point in the history

  124. Comments for profile and login

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    bb06bcb View commit details
    Browse the repository at this point in the history

  125. m

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b35ce32 View commit details
    Browse the repository at this point in the history

  126. Fix TItle

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    caff342 View commit details
    Browse the repository at this point in the history

  127. change spacing

    @parkersavage
    parkersavage committed May 2, 2024
    Configuration menu
    Copy the full SHA
    5b9aa02 View commit details
    Browse the repository at this point in the history

  128. Add files via upload

    @jeepjeep32
    jeepjeep32 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    cd03e46 View commit details
    Browse the repository at this point in the history

  129. Add files via upload

    @jeepjeep32
    jeepjeep32 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    0b5230f View commit details
    Browse the repository at this point in the history

  130. added more stuff

    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    920cc27 View commit details
    Browse the repository at this point in the history

  131. Merge branch 'main' of https://github.com/parkersavage/NewGroupB into… 

    … SamsBranch

# Conflicts:
#	node_modules/.package-lock.json
#	node_modules/color-name/LICENSE
#	node_modules/color-name/README.md
#	node_modules/color-name/index.js
#	node_modules/color-name/package.json
#	node_modules/ejs/bin/cli.js
#	node_modules/ejs/lib/ejs.js
#	node_modules/iconv-lite/Changelog.md
#	node_modules/iconv-lite/README.md
#	node_modules/iconv-lite/encodings/dbcs-codec.js
#	node_modules/iconv-lite/encodings/dbcs-data.js
#	node_modules/iconv-lite/encodings/index.js
#	node_modules/iconv-lite/encodings/internal.js
#	node_modules/iconv-lite/encodings/sbcs-data.js
#	node_modules/iconv-lite/encodings/tables/gbk-added.json
#	node_modules/iconv-lite/encodings/utf16.js
#	node_modules/iconv-lite/encodings/utf7.js
#	node_modules/iconv-lite/lib/index.d.ts
#	node_modules/iconv-lite/lib/index.js
#	node_modules/iconv-lite/lib/streams.js
#	node_modules/iconv-lite/package.json
#	node_modules/jake/bin/bash_completion.sh
#	node_modules/jake/bin/cli.js
#	node_modules/mime/cli.js
#	node_modules/mime/src/build.js
#	node_modules/mysql2/node_modules/iconv-lite/README.md
#	package-lock.json
#	package.json
    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    f861a68 View commit details
    Browse the repository at this point in the history

  132. nm

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a396fb4 View commit details
    Browse the repository at this point in the history

  133. ,

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    811a87d View commit details
    Browse the repository at this point in the history

  134. na

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    cfef7ec View commit details
    Browse the repository at this point in the history

  135. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @mrcdean16
    mrcdean16 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    04bae11 View commit details
    Browse the repository at this point in the history

  136. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ebe00a9 View commit details
    Browse the repository at this point in the history

  137. Merge branch 'main' of https://github.com/parkersavage/NewGroupB

    @HunterMena
    HunterMena committed May 2, 2024
    Configuration menu
    Copy the full SHA
    e1d3e83 View commit details
    Browse the repository at this point in the history

  138. updated pantry

    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    714b4e5 View commit details
    Browse the repository at this point in the history

  139. Merge branch 'main' of https://github.com/parkersavage/NewGroupB into… 

    … SamsBranch
    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    80f36d7 View commit details
    Browse the repository at this point in the history

  140. updated pantry

    @asapsui
    asapsui committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9b4a768 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Delete .env

    @asapsui
    asapsui authored May 3, 2024
    Configuration menu
    Copy the full SHA
    c5f0097 View commit details
    Browse the repository at this point in the history