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.

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

[CS2113T-F14-2] Fitbot #50

Open
wants to merge 887 commits into
base: master
Choose a base branch
from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Oct 30, 2021

  1. implement isValid method in Food and Exercise

    refactor isValid method
    move getActualIndex to ItemList and implement code inheritance there
    [email protected] committed Oct 30, 2021
    Configuration menu
    Copy the full SHA
    31e1800 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    69dee5c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    53539ec View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    89486f9 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #177 from tryyang2001/Branch-V2.1

    implement isValid method in Food and Exercise
    weidak authored Oct 30, 2021
    Configuration menu
    Copy the full SHA
    e453c91 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5ce9c77 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    22f58ab View commit details
    Browse the repository at this point in the history
  8. Merge pull request #178 from weidak/v2.1

    Make profile even more OOP
    tlyi authored Oct 30, 2021
    Configuration menu
    Copy the full SHA
    ceb34cd View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5fa4f2a View commit details
    Browse the repository at this point in the history
  10. add explanation for why the lifeline does not end even though the obj…

    …ect is deleted
    
    update manual testing section (add in instructions for view and delete)
    [email protected] committed Oct 30, 2021
    Configuration menu
    Copy the full SHA
    79c4e6a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    10c1926 View commit details
    Browse the repository at this point in the history
  12. Refactor StartState, modify help command, removed \t to avoid confusi…

    …on, changed \n to LS update userguide accordingly.
    
    Repeat user message on invalid input to prevent raging users.
    tttyyzzz committed Oct 30, 2021
    Configuration menu
    Copy the full SHA
    c9cb629 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    daaa5ac View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    602e6f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2021

  1. Configuration menu
    Copy the full SHA
    19bbabe View commit details
    Browse the repository at this point in the history
  2. Remove duplicate picture

    weidak committed Oct 31, 2021
    Configuration menu
    Copy the full SHA
    42b7cd9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bbe8921 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2021

  1. Add javadoc for classes

    tttyyzzz committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    6518b30 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b7e431e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ddf4a04 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #183 from tryyang2001/Branch-V2.1

    Update DG and Item Bank and Item Class Diagram
    tryyang2001 authored Nov 1, 2021
    Configuration menu
    Copy the full SHA
    4e15b80 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    374dbf5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    aaec88b View commit details
    Browse the repository at this point in the history
  7. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp

    …into v2.1
    
    # Conflicts:
    #	src/test/java/seedu/duke/food/FoodListTest.java
    weidak committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    ed846e9 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'v2.1' of https://github.com/weidak/tp into v2.1

    # Conflicts:
    #	src/test/java/seedu/duke/food/FoodListTest.java
    weidak committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    340faeb View commit details
    Browse the repository at this point in the history
  9. Merge branch 'master' into v2.1

    * master:
      delete outdated junit test in FoodListTest
      update input code example in Add Exercise command
      add explanation for why the lifeline does not end even though the object is deleted update manual testing section (add in instructions for view and delete)
      update puml diagram add Interface to the class diagram
      Minor change to accessibility in code
      Add enum class for activity levels
      Add ProfileUtils class to make profile more OOP
      fix spacing for javaDoc in itemlist line 172 to pass check
      implement isValid method in Food and Exercise refactor isValid method move getActualIndex to ItemList and implement code inheritance there
      Update data integrity of food and exercise
      Fix formatting error in delete command
    tlyi committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    089f97c View commit details
    Browse the repository at this point in the history
  10. Merge pull request #203 from tttyyzzz/brach-refactor-startstate

    Refactor StartState
    weidak authored Nov 1, 2021
    Configuration menu
    Copy the full SHA
    13d3455 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2021

  1. Merge pull request #208 from weidak/v2.1

    Developer guide updates to Storage and Profile
    weidak authored Nov 2, 2021
    Configuration menu
    Copy the full SHA
    0b1fb52 View commit details
    Browse the repository at this point in the history
  2. Merge commit '0b1fb52c40754a166f48d47632db82fcf219e00b' into v2.1

    * commit '0b1fb52c40754a166f48d47632db82fcf219e00b':
      Add javadoc for classes
      Remove outdated test case for foodlist
      Remove duplicate picture
      Update developer guide for loading data
      Add diagrams for StorageManager and subsequent references
      Undo changes that cause test to fail
      Refactor StartState, modify help command, removed \t to avoid confusion, changed \n to LS update userguide accordingly. Repeat user message on invalid input to prevent raging users.
    tlyi committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    5be141a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7d0c168 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    76fc418 View commit details
    Browse the repository at this point in the history
  5. Small updates to docs

    weidak committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    341d346 View commit details
    Browse the repository at this point in the history
  6. constraint on upcoming exercises

    deleting mulitple indexes for upcoming and banks
    xingjie99 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    1f29b09 View commit details
    Browse the repository at this point in the history
  7. UG update

    xingjie99 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    d6fe88e View commit details
    Browse the repository at this point in the history
  8. indentation

    xingjie99 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    2e959c0 View commit details
    Browse the repository at this point in the history
  9. indentation

    xingjie99 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    8cf14d9 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    225ff35 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    9e5943d View commit details
    Browse the repository at this point in the history
  12. Merge pull request #212 from weidak/v2.1

    Update data validity for profile attributes and storage
    weidak authored Nov 2, 2021
    Configuration menu
    Copy the full SHA
    775e055 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    3fba054 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b185f73 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    aa46552 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #213 from xingjie99/V2.1

    delete multiple items, data validity on upcoming date, update UG
    tlyi authored Nov 2, 2021
    Configuration menu
    Copy the full SHA
    b610085 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #214 from tryyang2001/Branch-V2.1

    Bug Fixing
    tlyi authored Nov 2, 2021
    Configuration menu
    Copy the full SHA
    8a4d051 View commit details
    Browse the repository at this point in the history
  18. Refactor ParserUtil methods to reduce code duplication

    Trim inputs so that whitespace do not affect
    Add parsing support for multiple indexes
    Fix parsing bug for extra/unnecessary paramaters
    tlyi committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    ded5d9a View commit details
    Browse the repository at this point in the history
  19. Add parser support for deleting multiple indexes (for ebank, fbank, u…

    …pcoming)
    
    Make it compulsory for item type to be first word in input after command word
    Make it compulsory for prefixes to be separated by whitespace
    Refactor Parser and ParserUtil classes to avoid long methods
    tlyi committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    1c850fc View commit details
    Browse the repository at this point in the history
  20. Minor formatting changes

    tlyi committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    c5817db View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2021

  1. Configuration menu
    Copy the full SHA
    0baed5b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #215 from tlyi/v2.1

    Fix parser bugs
    tlyi authored Nov 3, 2021
    Configuration menu
    Copy the full SHA
    13d9b1b View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into branch-v2.1

    Resolve merge conflict
    # Conflicts:
    #	src/main/java/seedu/duke/main/CreateName.java
    tttyyzzz committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    3e4a2f8 View commit details
    Browse the repository at this point in the history
  4. pass gradle check

    tttyyzzz committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    344f467 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2021

  1. Configuration menu
    Copy the full SHA
    61bb17d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d81b858 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a883860 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    08f0433 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7f17654 View commit details
    Browse the repository at this point in the history
  6. Reduce magic numbers

    tttyyzzz committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    0f4457c View commit details
    Browse the repository at this point in the history
  7. Remove more magic number.

    tttyyzzz committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    71564a5 View commit details
    Browse the repository at this point in the history
  8. Modify Userguide with by letting user know the presence of bye comman…

    …d when creating profile.
    tttyyzzz committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    173c940 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #217 from xingjie99/editMessages

    Messages for deleting multiple items
    tlyi authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    e292dbd View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5ec6e3d View commit details
    Browse the repository at this point in the history
  11. Merge branch 'master' into v2.1

    * master:
      Add some Junit tests for parsing, to add for EditCommandParser next
    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    70a4bea View commit details
    Browse the repository at this point in the history
  12. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp

    * 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp:
      edited the message for deleting of multiple items at once
    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    02e0f51 View commit details
    Browse the repository at this point in the history
  13. Merge branch 'master' into v2.1

    * master:
      edited the message for deleting of multiple items at once
    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    997aa98 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    a04febc View commit details
    Browse the repository at this point in the history
  15. Merge pull request #216 from tttyyzzz/branch-v2.1

    Add new functionality of bye when creating profile
    tryyang2001 authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    8ddf1d3 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    9ddee1c View commit details
    Browse the repository at this point in the history
  17. pass gradle

    xingjie99 committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    4225949 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    1c1762c View commit details
    Browse the repository at this point in the history
  19. Fix profile bug

    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    f775baa View commit details
    Browse the repository at this point in the history
  20. Merge pull request #218 from xingjie99/editMessages

    Delete multiple upcoming exercises and bank items
    tlyi authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    518e53c View commit details
    Browse the repository at this point in the history
  21. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp

    * 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp:
      pass gradle
      updated deleting multiple items
      Modify Userguide with by letting user know the presence of bye command when creating profile.
      Remove more magic number.
      Reduce magic numbers
      Add in design consideration for create profile.
      Add create profile to developer guide
      rename incorrect naming of class diagram
      Change \n to LS, reduce repeated code
      pass gradle check
      New feature -- users are able to exit while creating or repairing profile.
    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    5dddeb1 View commit details
    Browse the repository at this point in the history
  22. Merge branch 'v2.1'

    * v2.1:
      Fix profile bug
    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    aad84e1 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    3f9c7d7 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    b6e4765 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    0d0634d View commit details
    Browse the repository at this point in the history
  26. Standardise formatting

    Fix some bugs
    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    b5fb38c View commit details
    Browse the repository at this point in the history
  27. Merge pull request #220 from tryyang2001/Branch-V2.1

    Set upper bound for food and exercise calorie
    tryyang2001 authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    a2a8b1d View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    51f2bc5 View commit details
    Browse the repository at this point in the history
  29. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp

    * 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp:
      check calorie value for all add and edit commands
      fix bug in isWithinSevenDay method
      set upper bound for food and exercise calorie
    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    1b540b7 View commit details
    Browse the repository at this point in the history
  30. Add more lines

    weidak committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    7f796f5 View commit details
    Browse the repository at this point in the history
  31. PPP first draft

    xingjie99 committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    04f4159 View commit details
    Browse the repository at this point in the history
  32. commit

    xingjie99 committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    7d073cd View commit details
    Browse the repository at this point in the history
  33. Fix minor formatting errors

    PPP Draft overview
    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    a816ba9 View commit details
    Browse the repository at this point in the history
  34. Add PPP draft 0

    tttyyzzz committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    27c8ee8 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    3eb62e7 View commit details
    Browse the repository at this point in the history
  36. Checkstyle formatting

    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    f91e417 View commit details
    Browse the repository at this point in the history
  37. create PPP draft

    [email protected] committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    a37b414 View commit details
    Browse the repository at this point in the history
  38. Merge pull request #222 from tttyyzzz/branch-v2.1

    PPP draft
    tlyi authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    19ee2f2 View commit details
    Browse the repository at this point in the history
  39. Merge pull request #221 from xingjie99/PPP

    PPP first draft
    tlyi authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    653c088 View commit details
    Browse the repository at this point in the history
  40. Merge pull request #223 from tryyang2001/Branch-V2.1

    create PPP draft
    tlyi authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    8a2051c View commit details
    Browse the repository at this point in the history
  41. Update AboutUs links

    tlyi committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    d4a642c View commit details
    Browse the repository at this point in the history
  42. Merge pull request #224 from tlyi/v2.1-clean-up

    Merge and clean up code
    tlyi authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    c540d59 View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    f7601c2 View commit details
    Browse the repository at this point in the history
  44. Format developers guide

    tttyyzzz committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    08ec947 View commit details
    Browse the repository at this point in the history
  45. Merge pull request #225 from tttyyzzz/branch-v2.1

    Format DG create profile section
    tttyyzzz authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    019ca19 View commit details
    Browse the repository at this point in the history
  46. Configuration menu
    Copy the full SHA
    1fb20d6 View commit details
    Browse the repository at this point in the history
  47. Fix storage error handling

    weidak committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    b930fa4 View commit details
    Browse the repository at this point in the history
  48. Configuration menu
    Copy the full SHA
    5c5f26b View commit details
    Browse the repository at this point in the history
  49. Minor formatting issues

    weidak committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    66e760c View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2021

  1. Merge pull request #226 from weidak/v2.1

    Storage bugs are better handled and update to documentations
    weidak authored Nov 5, 2021
    Configuration menu
    Copy the full SHA
    6178de2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    126727c View commit details
    Browse the repository at this point in the history
  3. added javadoc

    xingjie99 committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    765b72c View commit details
    Browse the repository at this point in the history
  4. edit javadoc

    xingjie99 committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    cf6a42e View commit details
    Browse the repository at this point in the history
  5. Merge pull request #227 from xingjie99/addJavaDoc

    added javadoc
    xingjie99 authored Nov 5, 2021
    Configuration menu
    Copy the full SHA
    c7f566e View commit details
    Browse the repository at this point in the history
  6. Merge branch 'master' into v2.1-clean-up

    * master:
      edit javadoc
      added javadoc
      Minor formatting issues
      Update documentation for PPP and slight changes to DG
      Fix storage error handling
      Format developers guide
      Format developers guide create profile section
      create PPP draft
      Add PPP draft 0
      commit
      PPP first draft
      Add more lines
    tlyi committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    c409f16 View commit details
    Browse the repository at this point in the history
  7. Modify developers guide

    tttyyzzz committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    a8cd74b View commit details
    Browse the repository at this point in the history
  8. Merge branch 'master' into branch-v2.1

    # Conflicts:
    #	docs/DeveloperGuide.md
    #	src/main/java/seedu/duke/main/CalorieGoalCreator.java
    tttyyzzz committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    52087d8 View commit details
    Browse the repository at this point in the history
  9. Include basic info for PPP

    tttyyzzz committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    cb1ae48 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2021

  1. Merge pull request #228 from tttyyzzz/branch-v2.1

    Modify DG and PPP
    weidak authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    961dac4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    61acbd6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5d84386 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9bd29a5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0bab786 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0726ff8 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'master' into v2.1-clean-up

    * master:
      Include basic info for PPP
      Modify developers guide
    tlyi committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    5c95904 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8669757 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9b952a4 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2021

  1. Configuration menu
    Copy the full SHA
    0ab768f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    877567c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    883a81f View commit details
    Browse the repository at this point in the history
  4. Update instructions for manual testing for Food Bank

    Update logic component related diagrams for DG, but explanations to be updated
    tlyi committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    9cc0a0f View commit details
    Browse the repository at this point in the history
  5. PPP

    xingjie99 committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    331efb8 View commit details
    Browse the repository at this point in the history
  6. UG edits

    xingjie99 committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    7860c20 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #229 from weidak/v2.1

    Update documentation
    tlyi authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    01573ff View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    65d9327 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #232 from xingjie99/version2.1

    XJ V2.1
    tlyi authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    544e24b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    048515d View commit details
    Browse the repository at this point in the history
  11. Merge pull request #231 from tryyang2001/Branch-V2.1

    Update PPP, DG and UG
    tlyi authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    e42886e View commit details
    Browse the repository at this point in the history
  12. Review and standardise UG

    Fix code bugs
    tlyi committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    d297030 View commit details
    Browse the repository at this point in the history
  13. Wrong test case

    tlyi committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    a5df4c6 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #230 from tlyi/v2.1-clean-up

    Update UG, DG, bugs
    tryyang2001 authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    12b302b View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    6899447 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    2ce7b36 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    7f69d28 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    fd86bf3 View commit details
    Browse the repository at this point in the history
  19. DG review

    tlyi committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    2a087e3 View commit details
    Browse the repository at this point in the history
  20. Merge pull request #233 from tryyang2001/Branch-V2.1

    Change the date range to 7 days
    tlyi authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    44e9998 View commit details
    Browse the repository at this point in the history
  21. Merge branch 'master' into v2.1-clean-up

    * master:
      restrict the date range to 7 days only (previously was 8)
    tlyi committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    89862d4 View commit details
    Browse the repository at this point in the history
  22. checkstyle error

    tlyi committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    3b4a664 View commit details
    Browse the repository at this point in the history
  23. Merge pull request #234 from tlyi/v2.1-clean-up

    Review DG
    tryyang2001 authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    1818af9 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    88b7a3f View commit details
    Browse the repository at this point in the history
  25. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp

    …into Branch-V2.1
    
    # Conflicts:
    #	docs/diagrams/ItemBankAndItemClassDiagram.puml
    #	docs/images/ItemBankAndItemClassDiagram.png
    [email protected] committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    1dea665 View commit details
    Browse the repository at this point in the history
  26. Commit to merge branch

    tttyyzzz committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    4588d63 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    b494d3b View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    835ae2a View commit details
    Browse the repository at this point in the history
  29. Update implementations

    weidak committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    c3dde1d View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    633ada8 View commit details
    Browse the repository at this point in the history
  31. Solidify test and logger

    tttyyzzz committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    7436cde View commit details
    Browse the repository at this point in the history
  32. format message

    xingjie99 committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    8082643 View commit details
    Browse the repository at this point in the history
  33. edits to UG

    xingjie99 committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    7134211 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. modify DG and PPP

    tttyyzzz committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    3b9023e View commit details
    Browse the repository at this point in the history
  2. Pass gradle check

    tttyyzzz committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    4a7f4b8 View commit details
    Browse the repository at this point in the history
  3. Changes to UG

    xingjie99 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    b773a74 View commit details
    Browse the repository at this point in the history
  4. Add more sequence diagrams

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    bf2416d View commit details
    Browse the repository at this point in the history
  5. Remove extra images

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    f22a516 View commit details
    Browse the repository at this point in the history
  6. Add formatting

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    96f5ccb View commit details
    Browse the repository at this point in the history
  7. Minor format

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    786cbf7 View commit details
    Browse the repository at this point in the history
  8. Fix DG

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    1729b8c View commit details
    Browse the repository at this point in the history
  9. Add more user stories.

    tttyyzzz committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    392fb63 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    18159f2 View commit details
    Browse the repository at this point in the history
  11. Checkstyle errors

    Format PPP headers
    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    369300e View commit details
    Browse the repository at this point in the history
  12. Merge commit '1818af948e74f28aef076379a84734e32c547d06' into v2.1-cle…

    …an-up
    
    * commit '1818af948e74f28aef076379a84734e32c547d06':
    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    bdb0883 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    daf422f View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    483f7a8 View commit details
    Browse the repository at this point in the history
  15. delete two old assertions

    xingjie99 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    72085e3 View commit details
    Browse the repository at this point in the history
  16. Update class diagrams

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    8c44379 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #235 from tttyyzzz/branch-v2.1

    Modify DG and update PPP, include logging and test code for startstate and its depended class
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    6e83a5b View commit details
    Browse the repository at this point in the history
  18. Merge pull request #236 from tlyi/v2.1-clean-up

    Fix bugs in delete command and format PPP
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    680b8fc View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    fff176a View commit details
    Browse the repository at this point in the history
  20. update architecture diagram, add description for State component

    add Data Component section in DG
    update ItemBankAndItemClassDiagram
    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    76c3bc7 View commit details
    Browse the repository at this point in the history
  21. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp

    …into Branch-V2.1
    
    # Conflicts:
    #	docs/DeveloperGuide.md
    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    086438a View commit details
    Browse the repository at this point in the history
  22. manual testing for DG

    xingjie99 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    261b1ab View commit details
    Browse the repository at this point in the history
  23. Update old dg

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    90ae894 View commit details
    Browse the repository at this point in the history
  24. Merge pull request #237 from xingjie99/FinalV2.1

    Update to UG and DG
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    b7ec610 View commit details
    Browse the repository at this point in the history
  25. Minor fix

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    ed5e57b View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    f3200a7 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    d69b901 View commit details
    Browse the repository at this point in the history
  28. Add manual testing

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    1739170 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    68e65f1 View commit details
    Browse the repository at this point in the history
  30. Minor fixes, pass gradle

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    bd8ebaf View commit details
    Browse the repository at this point in the history
  31. Minor update to dg format

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    f180e24 View commit details
    Browse the repository at this point in the history
  32. Merge pull request #239 from tryyang2001/Branch-V2.1

    Update DG
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    c692a8e View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    b96ddf9 View commit details
    Browse the repository at this point in the history
  34. Merge pull request #238 from weidak/v2.1

    Update documentation for developer guide
    xingjie99 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    191eee3 View commit details
    Browse the repository at this point in the history
  35. final edits to PPP UG DG

    xingjie99 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    29e3f39 View commit details
    Browse the repository at this point in the history
  36. Update UserGuide.md

    xingjie99 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    fde2f47 View commit details
    Browse the repository at this point in the history
  37. added photo

    xingjie99 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    641d84b View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    22cc3d9 View commit details
    Browse the repository at this point in the history
  39. update picture

    xingjie99 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    066d463 View commit details
    Browse the repository at this point in the history
  40. Final DG and PPP updates

    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    efbabd1 View commit details
    Browse the repository at this point in the history
  41. Resolve merge conflicts in DG

    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    67cbcf4 View commit details
    Browse the repository at this point in the history
  42. Update picture in AboutUs

    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    98af16c View commit details
    Browse the repository at this point in the history
  43. Add PR link to PPP

    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    50de394 View commit details
    Browse the repository at this point in the history
  44. Merge pull request #240 from xingjie99/finalEdits

    Final edits to PPP UG DG
    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    38cdcfd View commit details
    Browse the repository at this point in the history
  45. Merge pull request #241 from tlyi/v2.1-clean-up

    Final edits to DG and PPP
    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    587dfc1 View commit details
    Browse the repository at this point in the history
  46. Configuration menu
    Copy the full SHA
    59284f3 View commit details
    Browse the repository at this point in the history
  47. update aboutus

    make all headers bolded in dg
    updates itembank class diagram
    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    1e089ad View commit details
    Browse the repository at this point in the history
  48. Add data limits

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    b497914 View commit details
    Browse the repository at this point in the history
  49. Configuration menu
    Copy the full SHA
    760faf1 View commit details
    Browse the repository at this point in the history
  50. Merge pull request #243 from weidak/v2.1

    Add data limits
    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    53c9765 View commit details
    Browse the repository at this point in the history
  51. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp

    …into Branch-V2.1
    
    # Conflicts:
    #	docs/AboutUs.md
    #	docs/DeveloperGuide.md
    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    472c38a View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    cd52deb View commit details
    Browse the repository at this point in the history
  53. move Data Limits to section 6

    add description to data limits
    fix exclamation mark emoji position
    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    05c8134 View commit details
    Browse the repository at this point in the history
  54. Merge pull request #242 from tttyyzzz/branch-v2.1

    Add photo :)
    tryyang2001 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    db4288b View commit details
    Browse the repository at this point in the history
  55. Configuration menu
    Copy the full SHA
    ba94445 View commit details
    Browse the repository at this point in the history
  56. update AboutUs

    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    8bbf569 View commit details
    Browse the repository at this point in the history
  57. fix typo

    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    bf72310 View commit details
    Browse the repository at this point in the history
  58. fix AboutUs

    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    46237f8 View commit details
    Browse the repository at this point in the history
  59. Merge pull request #244 from tryyang2001/Branch-V2.1

    Updates UG, AboutUs
    tryyang2001 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    1044fcd View commit details
    Browse the repository at this point in the history
  60. Merge branch 'master' into v2.1-clean-up

    * master:
      fix AboutUs
      fix typo
      update AboutUs
      move Data Limits to section 6 add description to data limits fix exclamation mark emoji position
      Add data limits
      update aboutus make all headers bolded in dg updates itembank class diagram
      update picture
      adjust image size, make header bold
      added photo
      Update UserGuide.md
      final edits to PPP UG DG
    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    3d4ae18 View commit details
    Browse the repository at this point in the history
  61. modify format

    tttyyzzz committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    ef7f4f6 View commit details
    Browse the repository at this point in the history
  62. Update ppp

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    10b75c3 View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    e2ca646 View commit details
    Browse the repository at this point in the history
  64. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-2/tp

    …into v2.1
    
    # Conflicts:
    #	docs/UserGuide.md
    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    ad5d154 View commit details
    Browse the repository at this point in the history
  65. Configuration menu
    Copy the full SHA
    028aeed View commit details
    Browse the repository at this point in the history
  66. reformat PPP

    tttyyzzz committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    9aafc90 View commit details
    Browse the repository at this point in the history
  67. Update ppp even more

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    3f2a64b View commit details
    Browse the repository at this point in the history
  68. Configuration menu
    Copy the full SHA
    287daf7 View commit details
    Browse the repository at this point in the history
  69. Configuration menu
    Copy the full SHA
    66a59e1 View commit details
    Browse the repository at this point in the history
  70. Merge pull request #245 from tttyyzzz/branch-v2.1

    Format PPP
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    2a5a22b View commit details
    Browse the repository at this point in the history
  71. Merge pull request #246 from tryyang2001/Branch-V2.1

    Fix typo and formatting issue in DG
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    94f696a View commit details
    Browse the repository at this point in the history
  72. Merge pull request #248 from weidak/v2.1

    Update PPP
    tryyang2001 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    7004993 View commit details
    Browse the repository at this point in the history
  73. Update test cases

    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    c421f08 View commit details
    Browse the repository at this point in the history
  74. Fix PPP

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    c3fa590 View commit details
    Browse the repository at this point in the history
  75. Add one line

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    93163d3 View commit details
    Browse the repository at this point in the history
  76. Merge pull request #249 from weidak/v2.1

    PPP
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    5cd815f View commit details
    Browse the repository at this point in the history
  77. Merge pull request #247 from tlyi/v2.1-clean-up

    Update UG and fix bugs for release
    xingjie99 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    06eb599 View commit details
    Browse the repository at this point in the history
  78. shorten PPP

    [email protected] committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    6ca716f View commit details
    Browse the repository at this point in the history
  79. Merge pull request #250 from tryyang2001/Branch-V2.1

    Shorten PPP
    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    d743176 View commit details
    Browse the repository at this point in the history
  80. Update DeveloperGuide.md

    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    9ec4601 View commit details
    Browse the repository at this point in the history
  81. Update DeveloperGuide.md

    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    0732780 View commit details
    Browse the repository at this point in the history
  82. Update UserGuide.md

    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    3262e52 View commit details
    Browse the repository at this point in the history
  83. Update UserGuide.md

    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    5480011 View commit details
    Browse the repository at this point in the history
  84. format example in UG

    xingjie99 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    e1fb27c View commit details
    Browse the repository at this point in the history
  85. Merge pull request #251 from xingjie99/UGExamplesFormat

    format example in UG
    tryyang2001 authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    34fc6d0 View commit details
    Browse the repository at this point in the history
  86. second update to ug

    xingjie99 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    3615be6 View commit details
    Browse the repository at this point in the history
  87. Merge pull request #252 from xingjie99/UGExamplesFormat

    second update to ug
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    065cb89 View commit details
    Browse the repository at this point in the history
  88. Update diagrams

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    60f11dd View commit details
    Browse the repository at this point in the history
  89. Modify diagrams

    weidak committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    eb1c491 View commit details
    Browse the repository at this point in the history
  90. Update DeveloperGuide.md

    tlyi authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    93bc837 View commit details
    Browse the repository at this point in the history
  91. Change diagrams colour

    tlyi committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    fdd2e4e View commit details
    Browse the repository at this point in the history
  92. Merge pull request #253 from weidak/v2.1

    Update diagrams
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    160ef6a View commit details
    Browse the repository at this point in the history
  93. Merge pull request #254 from tlyi/v2.1-clean-up

    Change diagrams colour
    weidak authored Nov 8, 2021
    Configuration menu
    Copy the full SHA
    6bc99b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2021

  1. Update UserGuide.md

    tlyi authored Nov 11, 2021
    Configuration menu
    Copy the full SHA
    68d0603 View commit details
    Browse the repository at this point in the history
  2. Update UserGuide.md

    tlyi authored Nov 11, 2021
    Configuration menu
    Copy the full SHA
    9d890ae View commit details
    Browse the repository at this point in the history
  3. Update UserGuide.md

    tlyi authored Nov 11, 2021
    Configuration menu
    Copy the full SHA
    4ce29a7 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. Configuration menu
    Copy the full SHA
    2d9907e View commit details
    Browse the repository at this point in the history
  2. fix StatisticsTest

    tttyyzzz committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    2602202 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2021

  1. Merge pull request #255 from tttyyzzz/post

    add default calorieGoal if calorieGoal is not initialised
    tttyyzzz authored Dec 4, 2021
    Configuration menu
    Copy the full SHA
    9a2f637 View commit details
    Browse the repository at this point in the history