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

[CS2113-T12-2] Grocery in Time #33

Open
wants to merge 527 commits into
base: master
Choose a base branch
from
Open

[CS2113-T12-2] Grocery in Time #33

wants to merge 527 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Apr 10, 2024

  1. Fix more PED bugs

    @wallywallywally
    wallywallywally committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    c9fe1df View commit details
    Browse the repository at this point in the history

  2. Fix checkstyle issue

    @wallywallywally
    wallywallywally committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    15f3841 View commit details
    Browse the repository at this point in the history

  3. Update NoSuchObject exceptions thrown with more information

    @wallywallywally
    wallywallywally committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    2bde7e6 View commit details
    Browse the repository at this point in the history

  4. Fix fatal del bug related to storage locations

    @wallywallywally
    wallywallywally committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    f2ed673 View commit details
    Browse the repository at this point in the history

  5. Prevent duplicate groceries from being added

    @wallywallywally
    wallywallywally committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    e877ef9 View commit details
    Browse the repository at this point in the history

  6. Update tests to match new exceptions

    @wallywallywally
    wallywallywally committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    e55af58 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #153 from wallywallywally/branch-Willson 

    Update PPP and fix PED bugs
    @LuoYu-uwu
    LuoYu-uwu authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    49f85fd View commit details
    Browse the repository at this point in the history

  8. Merge pull request #154 from wallywallywally/branch-more-PEDs 

    Fix bugs related to duplicates and `del` storage locations
    @LuoYu-uwu
    LuoYu-uwu authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    5643e96 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5a122c1 View commit details
    Browse the repository at this point in the history

  2. Trimmed Recipe output

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    9c9e94a View commit details
    Browse the repository at this point in the history

  3. Amend my PPP

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5a82d2a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #155 from LuoYu-uwu/Branch-doc 

    Amend my PPP
    @wallywallywally
    wallywallywally authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    6bfb05d View commit details
    Browse the repository at this point in the history

  5. extracted RecipeUi from Ui

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3dbcf39 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a7d3181 View commit details
    Browse the repository at this point in the history

  7. Shorten my PPP

    @wallywallywally
    wallywallywally committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    8800c7c View commit details
    Browse the repository at this point in the history

  8. Add new features and documentation for Grocery in Time project

    @64-1
    64-1 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    cb79132 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #157 from 64-1/v1-final 

    Add new features and documentation for Grocery in Time project
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    bcb3a7c View commit details
    Browse the repository at this point in the history

  10. Added saveFile method for groceries, loadFile work in progress

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3caeb74 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4248f24 View commit details
    Browse the repository at this point in the history

  12. Add sequence diagram for calories and profile management

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    f9286f6 View commit details
    Browse the repository at this point in the history

  13. Create luozihui2003.md

    @luozihui2003
    luozihui2003 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    8ed2025 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ac55803 View commit details
    Browse the repository at this point in the history

  15. Add sequence diagram for executeCommand in parser

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e74febf View commit details
    Browse the repository at this point in the history

  16. Update user stories

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    1039cdf View commit details
    Browse the repository at this point in the history

  17. Extracted profile, calories Ui from Ui.

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2d69dd1 View commit details
    Browse the repository at this point in the history

  18. Updated calories to be integer

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2bd316e View commit details
    Browse the repository at this point in the history

  19. Merge pull request #159 from LuoYu-uwu/Branch-doc 

    Create sequence diagram for profileManagement and executeCommand
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    207b56f View commit details
    Browse the repository at this point in the history

  20. Merge branch 'AY2324S2-CS2113-T12-2:master' into master

    @SharlynLui
    SharlynLui authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5e4e5a5 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e169257 View commit details
    Browse the repository at this point in the history

  22. Edit checks

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    9e25724 View commit details
    Browse the repository at this point in the history

  23. Gradle check

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4d175f7 View commit details
    Browse the repository at this point in the history

  24. Gradle Check

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    d4befa7 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #160 from SharlynLui/master 

    Extracted Classes and trimmed Recipe output
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    55d3988 View commit details
    Browse the repository at this point in the history

  26. Add grocery command sequence diagram

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    b0eb5dd View commit details
    Browse the repository at this point in the history

  27. Merge pull request #161 from LuoYu-uwu/Branch-doc 

    Add grocery command sequence diagram
    @SharlynLui
    SharlynLui authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2dba80d View commit details
    Browse the repository at this point in the history

  28. Add save and load file function for grocery mode

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    59dd34c View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' into master

    @SharlynLui
    SharlynLui authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    de48ac7 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #156 from wallywallywally/branch-Willson 

    Shorten my PPP
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    fe249a0 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'AY2324S2-CS2113-T12-2:master' into master

    @luozihui2003
    luozihui2003 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    8152c18 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp 

    # Conflicts:
#	src/main/java/git/Ui.java
#	src/main/java/grocery/GroceryList.java
    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e586b4a View commit details
    Browse the repository at this point in the history

  33. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	src/main/java/git/Ui.java
#	src/main/java/grocery/GroceryList.java
    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2f6560e View commit details
    Browse the repository at this point in the history

  34. gradle checks

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a1b3de5 View commit details
    Browse the repository at this point in the history

  35. gradle check: static final change to final static

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    7db2696 View commit details
    Browse the repository at this point in the history

  36. gradle check: move FILE_PATH in front

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    6c89239 View commit details
    Browse the repository at this point in the history

  37. gradle: change FILE_PATH to the path

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a93c1ea View commit details
    Browse the repository at this point in the history

  38. gradle: changed expected.txt and removed print no saved groceries

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    07806ed View commit details
    Browse the repository at this point in the history

  39. gradle: changed expected.txt and removed print no saved groceries

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5a76900 View commit details
    Browse the repository at this point in the history

  40. Merge pull request #162 from luozihui2003/master 

    Add save and load file for grocery mode
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    1d37809 View commit details
    Browse the repository at this point in the history

  41. Add ADDMULTI command to GroceryCommand enum and implement promptAddMu… 

    …ltipleMenu() method in GroceryUi class
    @64-1
    64-1 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    173cc6d View commit details
    Browse the repository at this point in the history

  42. Refactor GroceryList sortByExpiration method to handle groceries with… 

    …out expiration dates
    @64-1
    64-1 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    31d27a8 View commit details
    Browse the repository at this point in the history

  43. Refactor GroceryList sortByExpiration method to handle groceries with… 

    …out expiration dates and improve code readability
    @64-1
    64-1 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    68c94ca View commit details
    Browse the repository at this point in the history

  44. Merge pull request #163 from 64-1/v1-final 

    Add ADDMULTI command to GroceryCommand enum and implement promptAddMu…
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    bf5d8b9 View commit details
    Browse the repository at this point in the history

  45. Include grocerymanagement sequence diagram in developer guide

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    b62341a View commit details
    Browse the repository at this point in the history

  46. Update code such that only "exit" will terminate program

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    79a368b View commit details
    Browse the repository at this point in the history

  47. Update code to print nothing when no food was consumed

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    d501db7 View commit details
    Browse the repository at this point in the history

  48. Add sequence diagrams

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    0be47be View commit details
    Browse the repository at this point in the history

  49. Add class diagrams

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    9baa8f3 View commit details
    Browse the repository at this point in the history

  50. Update the old sequence diagram

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    18cbce1 View commit details
    Browse the repository at this point in the history

  51. Merge pull request #164 from LuoYu-uwu/Branch-diagram 

    Add class diagrams and fixed some bugs
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    1631780 View commit details
    Browse the repository at this point in the history

  52. Update UserInfo class diagram

    @LuoYu-uwu
    LuoYu-uwu committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    55bb7bf View commit details
    Browse the repository at this point in the history

  53. Merge pull request #165 from LuoYu-uwu/Branch-diagram 

    Update UserInfo class diagram
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    04d86d3 View commit details
    Browse the repository at this point in the history

  54. Add save and load file for recipe

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    95697c0 View commit details
    Browse the repository at this point in the history

  55. gradle: style checks

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5c401a4 View commit details
    Browse the repository at this point in the history

  56. gradle: removed print

    @luozihui2003
    luozihui2003 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    772b4f1 View commit details
    Browse the repository at this point in the history

  57. Merge pull request #166 from luozihui2003/saveRecipe 

    Add save and load file for recipe
    @64-1
    64-1 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    30acf9a View commit details
    Browse the repository at this point in the history

  58. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2beef51 View commit details
    Browse the repository at this point in the history

  59. PPP

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    8100a45 View commit details
    Browse the repository at this point in the history

  60. Merge pull request #167 from SharlynLui/master 

    PPP
    @luozihui2003
    luozihui2003 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    de28661 View commit details
    Browse the repository at this point in the history

  61. Updated PPP

    @SharlynLui
    SharlynLui committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    d45c167 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Merge pull request #168 from SharlynLui/master 

    Updated PPP
    @wallywallywally
    wallywallywally authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    a8218ed View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    bea0894 View commit details
    Browse the repository at this point in the history

  3. Fixed Ratings accepting 0 and Added View Grocery feature

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    6fe68bc View commit details
    Browse the repository at this point in the history

  4. Updated test cases

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b1450ca View commit details
    Browse the repository at this point in the history

  5. Fix Location bugs and update User Guide

    @wallywallywally
    wallywallywally committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b4c6b0c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #169 from SharlynLui/master 

    Fixed rating accepting 0 and added view grocery feature
    @SharlynLui
    SharlynLui authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    d29a511 View commit details
    Browse the repository at this point in the history

  7. Fix checkstyle issues

    @wallywallywally
    wallywallywally committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    565431f View commit details
    Browse the repository at this point in the history

  8. Resolve merge conflict related to store data

    @wallywallywally
    wallywallywally committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    1374e9b View commit details
    Browse the repository at this point in the history

  9. Add save UserInfo

    @luozihui2003
    luozihui2003 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    234b296 View commit details
    Browse the repository at this point in the history

  10. Add save UserInfo

    @luozihui2003
    luozihui2003 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    d4e81bf View commit details
    Browse the repository at this point in the history

  11. Add save to delete recipe

    @luozihui2003
    luozihui2003 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    835aa14 View commit details
    Browse the repository at this point in the history

  12. Enable remark to be edtied.

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b293cc1 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'AY2324S2-CS2113-T12-2:master' into master

    @SharlynLui
    SharlynLui authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    4375da0 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    8068f4b View commit details
    Browse the repository at this point in the history

  15. Gradle Check

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    79e3eb1 View commit details
    Browse the repository at this point in the history

  16. no message

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    fb47747 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #170 from wallywallywally/branch-Willson 

    Fix Location bugs and update User Guide
    @SharlynLui
    SharlynLui authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    bb5c971 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #171 from luozihui2003/saveProfile 

    Add save profile
    @SharlynLui
    SharlynLui authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    21d6128 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' of https://github.com/SharlynLui/tp 

    # Conflicts:
#	data/groceryList.txt
    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b4b7042 View commit details
    Browse the repository at this point in the history

  20. Gradle checks

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    ded4336 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    12c3ed4 View commit details
    Browse the repository at this point in the history

  22. gradle check

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    e7bedbb View commit details
    Browse the repository at this point in the history

  23. gradle checks

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    7858e0b View commit details
    Browse the repository at this point in the history

  24. gradle check

    @SharlynLui
    SharlynLui committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    ee1ec7b View commit details
    Browse the repository at this point in the history

  25. no changes... trying to pull

    @luozihui2003
    luozihui2003 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    d2f12ab View commit details
    Browse the repository at this point in the history

  26. Fix exiring command and add email notification

    @64-1
    64-1 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    23ec462 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp … 

    …into v1-final
    @64-1
    64-1 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    57737af View commit details
    Browse the repository at this point in the history

  28. Merge pull request #173 from SharlynLui/master 

    Allow edit for Remark
    @wallywallywally
    wallywallywally authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    849e87a View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp … 

    …into v1-final
    @64-1
    64-1 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    ad94616 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #174 from 64-1/v1-final 

    Fix expiring command and add email notification
    @64-1
    64-1 authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    5408403 View commit details
    Browse the repository at this point in the history

  31. Remove some developer comments in Ui

    @wallywallywally
    wallywallywally committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    79eeca1 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    6efc320 View commit details
    Browse the repository at this point in the history

  2. Updated User Guide, help list. Organised User Guide commands for Groc… 

    …ery Management into 3 categories.
    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    84f8aa6 View commit details
    Browse the repository at this point in the history

  3. Reorganise UG and updated UG

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    6bfe1c1 View commit details
    Browse the repository at this point in the history

  4. Add more test code

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    64658f6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp … 

    …into v1-final
    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    647ff19 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    9a23360 View commit details
    Browse the repository at this point in the history

  7. Delete grocery

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    b886879 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #175 from SharlynLui/master 

    Organise UG Grocery Management Commands and update UG
    @wallywallywally
    wallywallywally authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    9bc047f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #176 from 64-1/v1-final 

    Add more test codes
    @wallywallywally
    wallywallywally authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    2e62e34 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into branch-Willson

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    30928a4 View commit details
    Browse the repository at this point in the history

  11. Update DG and UG

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    76d9ad4 View commit details
    Browse the repository at this point in the history

  12. Update jline library version to 3.20.0

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    62c2233 View commit details
    Browse the repository at this point in the history

  13. Update jline library version to 3.20.0

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    3f23dcd View commit details
    Browse the repository at this point in the history

  14. Merge pull request #177 from 64-1/v1-final 

    Update UG and DG
    @64-1
    64-1 authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    e85947f View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    0fd3c42 View commit details
    Browse the repository at this point in the history

  16. Update User Guide and clean up printGrocery

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    a540b5a View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' into branch-Willson

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    e5246f7 View commit details
    Browse the repository at this point in the history

  18. Fix tests

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    d838331 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #178 from wallywallywally/branch-Willson 

    Update User Guide and clean up printGrocery
    @wallywallywally
    wallywallywally authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    fdaf42d View commit details
    Browse the repository at this point in the history

  20. Delete data directory 

    Always changes depending on developer.
    @wallywallywally
    wallywallywally authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    7f8d099 View commit details
    Browse the repository at this point in the history

  21. Add find recipe

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    8778db2 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    769737e View commit details
    Browse the repository at this point in the history

  23. Disallow duplicates to be added recipe

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    70ea802 View commit details
    Browse the repository at this point in the history

  24. Edit Recipe

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    5f0d79b View commit details
    Browse the repository at this point in the history

  25. Gradle Check

    @SharlynLui
    SharlynLui committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    01adbfb View commit details
    Browse the repository at this point in the history

  26. Merge pull request #179 from SharlynLui/master 

    Add feature to edit recipe
    @SharlynLui
    SharlynLui authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    ec06d46 View commit details
    Browse the repository at this point in the history

  27. Update README.md with new features and installation instructions

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    7bf5f58 View commit details
    Browse the repository at this point in the history

  28. Update README.md with new features, build automation using Gradle, te… 

    …sting instructions, Checkstyle, CI using GitHub Actions, and documentation
    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    bc3e0cf View commit details
    Browse the repository at this point in the history

  29. Merge pull request #180 from 64-1/v1-final 

    Update README.md with new features and installation instructions
    @wallywallywally
    wallywallywally authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    2fd101a View commit details
    Browse the repository at this point in the history

  30. Update User Guide and fix minor bugs

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    9bd3ad8 View commit details
    Browse the repository at this point in the history

  31. Update docs/README

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    430e3f9 View commit details
    Browse the repository at this point in the history

  32. Hide unfinished addmulti in User Guide

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    e4fb583 View commit details
    Browse the repository at this point in the history

  33. Fix issues for multiple grocery names in promptAddMultipleMenu method

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    7b61506 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #182 from 64-1/v1-final 

    Fix issues for multiple grocery names in promptAddMultipleMenu method
    @LuoYu-uwu
    LuoYu-uwu authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    abea7b2 View commit details
    Browse the repository at this point in the history

  35. Add displayWelcomeMessage method to Ui class

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    91555a4 View commit details
    Browse the repository at this point in the history

  36. Update README.md with new features, build automation using Gradle, te… 

    …sting instructions, Checkstyle, CI using GitHub Actions, and documentation
    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    b0ce1ba View commit details
    Browse the repository at this point in the history

  37. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    04b8ae8 View commit details
    Browse the repository at this point in the history

  38. Fix mistakes

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    41ccce9 View commit details
    Browse the repository at this point in the history

  39. Update welcome message in EXPECTED.TXT

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    03c2b41 View commit details
    Browse the repository at this point in the history

  40. Restore addmulti in User Guide

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    75d2d1f View commit details
    Browse the repository at this point in the history

  41. Fix checkstyle issues

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    555e67e View commit details
    Browse the repository at this point in the history

  42. Merge pull request #183 from 64-1/v1-final 

    Add logo and welcome message
    @wallywallywally
    wallywallywally authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    c4f8cc7 View commit details
    Browse the repository at this point in the history

  43. Merge pull request #181 from wallywallywally/master 

    Update User Guide and fix minor bugs
    @wallywallywally
    wallywallywally authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    c930aba View commit details
    Browse the repository at this point in the history

  44. Fix issues for multiple grocery names in promptAddMultipleMenu method

    @64-1
    64-1 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    14ae938 View commit details
    Browse the repository at this point in the history

  45. Update PPP

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    64ec3b9 View commit details
    Browse the repository at this point in the history

  46. Merge pull request #184 from 64-1/v1-final 

    Fix issues for multiple grocery names in promptAddMultipleMenu method
    @wallywallywally
    wallywallywally authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    629b936 View commit details
    Browse the repository at this point in the history

  47. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    01cf507 View commit details
    Browse the repository at this point in the history

  48. Add sequence diagram for editCost and editThreshold

    @LuoYu-uwu
    LuoYu-uwu committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    89ff41d View commit details
    Browse the repository at this point in the history

  49. Edit error

    @LuoYu-uwu
    LuoYu-uwu committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    64f6c5f View commit details
    Browse the repository at this point in the history

  50. Merge pull request #185 from LuoYu-uwu/Branch-DG3.0 

    Add sequence diagram for editCost and editThreshold
    @LuoYu-uwu
    LuoYu-uwu authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    1fee5a6 View commit details
    Browse the repository at this point in the history

  51. Load storage locations

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    322a118 View commit details
    Browse the repository at this point in the history

  52. Fix checkstyle issues

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    ac56caf View commit details
    Browse the repository at this point in the history

  53. Fix checkstyle issues

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    b1a7a4f View commit details
    Browse the repository at this point in the history

  54. Merge pull request #186 from wallywallywally/master 

    Load stored groceries
    @64-1
    64-1 authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    7e3dc7e View commit details
    Browse the repository at this point in the history

  55. Wipes saved file if corrupted

    @luozihui2003
    luozihui2003 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    1a5cd0c View commit details
    Browse the repository at this point in the history

  56. Resolve merge conflict between location edits and corrupt file

    @luozihui2003
    luozihui2003 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    919df84 View commit details
    Browse the repository at this point in the history

  57. Merge branch 'master' into saveProfile

    @luozihui2003
    luozihui2003 authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    b4fcded View commit details
    Browse the repository at this point in the history

  58. Add more testing

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    87b21ad View commit details
    Browse the repository at this point in the history

  59. Import user.UserInfo in Git.java

    @luozihui2003
    luozihui2003 authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    a8f99b7 View commit details
    Browse the repository at this point in the history

  60. FIx User Guide formatting

    @wallywallywally
    wallywallywally committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    34ae7b5 View commit details
    Browse the repository at this point in the history

  61. gradle: stylecheck storage.java

    @luozihui2003
    luozihui2003 authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    47ee28d View commit details
    Browse the repository at this point in the history

  62. gradle: stylecheck storage again...

    @luozihui2003
    luozihui2003 authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    241a869 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. Merge pull request #188 from wallywallywally/master 

    Add more testing
    @LuoYu-uwu
    LuoYu-uwu authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    b9cf987 View commit details
    Browse the repository at this point in the history

  2. Fix error in calculation of calories

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    e2b9a2e View commit details
    Browse the repository at this point in the history

  3. Add some unit test and update sequence diagram

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    20afdde View commit details
    Browse the repository at this point in the history

  4. Add test to food

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    20893f2 View commit details
    Browse the repository at this point in the history

  5. Add test for userInfo

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    7ac453a View commit details
    Browse the repository at this point in the history

  6. Fix checkstyle error

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    f3dffc4 View commit details
    Browse the repository at this point in the history

  7. Update user guide

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    7576010 View commit details
    Browse the repository at this point in the history

  8. Update PPP

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    b80342e View commit details
    Browse the repository at this point in the history

  9. Update PPP

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    a7d8f9b View commit details
    Browse the repository at this point in the history

  10. Update PPP

    @LuoYu-uwu
    LuoYu-uwu committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    8cd6496 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into saveProfile

    @wallywallywally
    wallywallywally authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    8fcb731 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #189 from luozihui2003/saveProfile 

    Merge Location edits and Corrupt file edits
    @wallywallywally
    wallywallywally authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    6d0bd17 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #190 from LuoYu-uwu/Branch-test 

    Branch test
    @wallywallywally
    wallywallywally authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    dfe6665 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    96768b9 View commit details
    Browse the repository at this point in the history

  15. Add recipe tests

    @SharlynLui
    SharlynLui committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    48be00e View commit details
    Browse the repository at this point in the history

  16. Gradle checks

    @SharlynLui
    SharlynLui committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    d8cadce View commit details
    Browse the repository at this point in the history

  17. Merge pull request #191 from SharlynLui/master 

    Recipe Test
    @wallywallywally
    wallywallywally authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    16aab81 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    df01ea9 View commit details
    Browse the repository at this point in the history

  19. Update exception handing for cost, list commands

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    719d557 View commit details
    Browse the repository at this point in the history

  20. Fix data loading issues and clean up loaded data

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    59c2f83 View commit details
    Browse the repository at this point in the history

  21. Clean up checkstyle

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    ae0efeb View commit details
    Browse the repository at this point in the history

  22. Add test cases related to Storage functionalities

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    d544799 View commit details
    Browse the repository at this point in the history

  23. Fix checkstyle issues

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    0751d8a View commit details
    Browse the repository at this point in the history

  24. Merge pull request #192 from wallywallywally/master 

    Clean up data loading
    @wallywallywally
    wallywallywally authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    5ac5683 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    9ed2cb6 View commit details
    Browse the repository at this point in the history

  26. Add new test cases

    @SharlynLui
    SharlynLui committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    879b948 View commit details
    Browse the repository at this point in the history

  27. Edit test case

    @SharlynLui
    SharlynLui committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    56d82a3 View commit details
    Browse the repository at this point in the history

  28. Gradle Check

    @SharlynLui
    SharlynLui committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    d147cd2 View commit details
    Browse the repository at this point in the history

  29. Update Dev Guide and add sample data for testers

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    175289a View commit details
    Browse the repository at this point in the history

  30. Updated PPP (left DG and Repolink to be added)

    @SharlynLui
    SharlynLui committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    532fa9a View commit details
    Browse the repository at this point in the history

  31. Update Dev Guide

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    0a97f0e View commit details
    Browse the repository at this point in the history

  32. Update Dev Guide and my PPP

    @wallywallywally
    wallywallywally committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    612443e View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Update Dev Guide with editLocation

    @wallywallywally
    wallywallywally committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    44b8558 View commit details
    Browse the repository at this point in the history

  2. Update tests

    @wallywallywally
    wallywallywally committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    729c844 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #193 from SharlynLui/master 

    Test Cases
    @wallywallywally
    wallywallywally authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    04c961c View commit details
    Browse the repository at this point in the history

  4. Resolve merge conflicts in User Guide

    @wallywallywally
    wallywallywally committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    e49e8f7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #194 from wallywallywally/master 

    Update Dev Guide and my PPP
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    22afac6 View commit details
    Browse the repository at this point in the history

  6. Use constants for category

    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9019023 View commit details
    Browse the repository at this point in the history

  7. Make return statement for promptforAmount more obvious, set limit to … 

    …number of times user can enter amount
    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    4c10a6a View commit details
    Browse the repository at this point in the history

  8. gradle: move public static

    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    0cdbe3d View commit details
    Browse the repository at this point in the history

  9. edit category

    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d9d4974 View commit details
    Browse the repository at this point in the history

  10. gradle: remove grams from tests

    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    844b26a View commit details
    Browse the repository at this point in the history

  11. Modify readme.md and add sequence diagram

    @64-1
    64-1 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    58437a8 View commit details
    Browse the repository at this point in the history

  12. Add new features and improvements to Grocery in Time application

    @64-1
    64-1 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9dd042e View commit details
    Browse the repository at this point in the history

  13. Merge pull request #195 from luozihui2003/saveProfile 

    Make return statement for promptforAmount more obvious, set limit to number of times user can enter amount
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    af9e7c6 View commit details
    Browse the repository at this point in the history

  14. edit PPP

    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    e6081c7 View commit details
    Browse the repository at this point in the history

  15. add imporvement to ppp

    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    6676d54 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #196 from 64-1/v1-final 

    Modify readme and add sequence diagram to DG
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    7a5ff3c View commit details
    Browse the repository at this point in the history

  17. Merge pull request #197 from luozihui2003/saveProfile 

    edit PPP
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d4805e8 View commit details
    Browse the repository at this point in the history

  18. Update README

    @wallywallywally
    wallywallywally committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    e2051c9 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp

    @wallywallywally
    wallywallywally committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    a8b0813 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #198 from wallywallywally/master 

    Update AboutUs.md
    @wallywallywally
    wallywallywally authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d082cea View commit details
    Browse the repository at this point in the history

  21. Fix issue in AboutUs

    @wallywallywally
    wallywallywally committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    2ccefa7 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp

    @wallywallywally
    wallywallywally committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    a136367 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #199 from wallywallywally/master 

    Fix small issue in AboutUs
    @wallywallywally
    wallywallywally authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    90f36f1 View commit details
    Browse the repository at this point in the history

  24. Add validation for input number in GroceryUi.java

    @64-1
    64-1 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    1a40b79 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #200 from 64-1/v1-final 

    Add validation for input number in GroceryUi.java
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    e1fcbcd View commit details
    Browse the repository at this point in the history

  26. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    b6d0f1a View commit details
    Browse the repository at this point in the history

  27. Add License.md

    @64-1
    64-1 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    818da9e View commit details
    Browse the repository at this point in the history

  28. PPP and DG

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    fd7c4cf View commit details
    Browse the repository at this point in the history

  29. Minor edit

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    728120b View commit details
    Browse the repository at this point in the history

  30. Add CONTRICUTING.md

    @64-1
    64-1 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    3ae8988 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #202 from SharlynLui/master 

    Update DG and PPP
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    72e2d91 View commit details
    Browse the repository at this point in the history

  32. Update README.md with link to CONTRIBUTING.md

    @64-1
    64-1 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    5b25698 View commit details
    Browse the repository at this point in the history

  33. Merge pull request #201 from 64-1/v1-final 

    Add LICENSE.md
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    58e3b83 View commit details
    Browse the repository at this point in the history

  34. Edited Reposense Link

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9d5b73c View commit details
    Browse the repository at this point in the history

  35. add to ppp

    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9c365c5 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #203 from SharlynLui/master 

    Edited Reposense Link
    @luozihui2003
    luozihui2003 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    8b2af63 View commit details
    Browse the repository at this point in the history

  37. Update review/mentoring contributions in team/64-1.md

    @64-1
    64-1 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9b59ff4 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #204 from luozihui2003/saveProfile 

    add to ppp
    @SharlynLui
    SharlynLui authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    5830980 View commit details
    Browse the repository at this point in the history

  39. edit ppp again

    @luozihui2003
    luozihui2003 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    386e51e View commit details
    Browse the repository at this point in the history

  40. PPP

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    e045f10 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'AY2324S2-CS2113-T12-2:master' into master

    @SharlynLui
    SharlynLui authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    32f4652 View commit details
    Browse the repository at this point in the history

  42. PPP

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    6b08faa View commit details
    Browse the repository at this point in the history

  43. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    2ca2e97 View commit details
    Browse the repository at this point in the history

  44. PPP

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    e1ccdf6 View commit details
    Browse the repository at this point in the history

  45. Update 64-1.md

    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    bdf6e45 View commit details
    Browse the repository at this point in the history

  46. Merge pull request #206 from luozihui2003/saveProfile 

    edit ppp again
    @SharlynLui
    SharlynLui authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    2eeae89 View commit details
    Browse the repository at this point in the history

  47. Merge pull request #207 from SharlynLui/master 

    PPP
    @luozihui2003
    luozihui2003 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    be24e2b View commit details
    Browse the repository at this point in the history

  48. Merge pull request #205 from 64-1/v1-final 

    Update review/mentoring contributions in team/64-1.md
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    8822ebd View commit details
    Browse the repository at this point in the history

  49. One full stop.

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    3e72dd8 View commit details
    Browse the repository at this point in the history

  50. Merge branch 'AY2324S2-CS2113-T12-2:master' into master

    @SharlynLui
    SharlynLui authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    bf36428 View commit details
    Browse the repository at this point in the history

  51. Merge pull request #208 from SharlynLui/master 

    One full stop.
    @luozihui2003
    luozihui2003 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d932b66 View commit details
    Browse the repository at this point in the history

  52. UG

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    eb728aa View commit details
    Browse the repository at this point in the history

  53. Merge branch 'master' of https://github.com/SharlynLui/tp

    @SharlynLui
    SharlynLui committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    ed5201a View commit details
    Browse the repository at this point in the history

  54. Merge branch 'AY2324S2-CS2113-T12-2:master' into master

    @SharlynLui
    SharlynLui authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    fbbcadd View commit details
    Browse the repository at this point in the history

  55. Merge pull request #209 from SharlynLui/master 

    UG
    @64-1
    64-1 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    5edeab7 View commit details
    Browse the repository at this point in the history

  56. Update .gitignore

    @wallywallywally
    wallywallywally authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    2cdab08 View commit details
    Browse the repository at this point in the history