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

[CS2103T-W11-3] My Fitness Buddy #65

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

[CS2103T-W11-3] My Fitness Buddy #65

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

Commits on Nov 6, 2020

  1. test CalorieCommand and RemoveCommand parser

    Wayne committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    3b60ade View commit details
    Browse the repository at this point in the history

  2. PPP draft

    @hoperawr
    hoperawr committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    dad7b1e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #227 from hoperawr/branch-PPP 

    PPP draft
    @hoperawr
    hoperawr authored Nov 6, 2020
    Configuration menu
    Copy the full SHA
    6479053 View commit details
    Browse the repository at this point in the history

  4. Update dg

    @ethanso56
    ethanso56 committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    b6ace5e View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master'

    @ethanso56
    ethanso56 committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    af8755f View commit details
    Browse the repository at this point in the history

  6. Update ppp

    @ethanso56
    ethanso56 committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    3235c70 View commit details
    Browse the repository at this point in the history

  7. update ppp

    @ethanso56
    ethanso56 committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    1e27e19 View commit details
    Browse the repository at this point in the history

  8. Add PPP draft

    @junhui-phoon
    junhui-phoon committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    a189b08 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #228 from ethanso56/ethan-ppp 

    Ethan ppp
    @ethanso56
    ethanso56 authored Nov 6, 2020
    Configuration menu
    Copy the full SHA
    ea5e6a3 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #229 from junhui-phoon/branch-PPPDraft 

    Add PPP draft
    @junhui-phoon
    junhui-phoon authored Nov 6, 2020
    Configuration menu
    Copy the full SHA
    25be8a2 View commit details
    Browse the repository at this point in the history

  11. Edit PPP links in AboutUs

    @junhui-phoon
    junhui-phoon committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    08193b9 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #230 from junhui-phoon/branch-PPPDraft 

    Edit PPP links in AboutUs
    @junhui-phoon
    junhui-phoon authored Nov 6, 2020
    Configuration menu
    Copy the full SHA
    7b200ed View commit details
    Browse the repository at this point in the history

  13. AdaptedInput and output test cases

    @hoperawr
    hoperawr committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    3a564ac View commit details
    Browse the repository at this point in the history

  14. no message

    @hoperawr
    hoperawr committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    efb764b View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2020

  1. Update ppp

    @ethanso56
    ethanso56 committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    fc0a4ce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ethan-ppp

    @ethanso56
    ethanso56 committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    9782a2b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #231 from ethanso56/ethan-ppp 

    Ethan ppp
    @ethanso56
    ethanso56 authored Nov 7, 2020
    Configuration menu
    Copy the full SHA
    c2010f9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #226 from jiaax/branch-UniqueId 

    Person identified by ID only
    @ethanso56
    ethanso56 authored Nov 7, 2020
    Configuration menu
    Copy the full SHA
    2fab8ae View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into ethan-update-dg

    @ethanso56
    ethanso56 committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    2d63d3e View commit details
    Browse the repository at this point in the history

  6. Update dg and uidiagram

    @ethanso56
    ethanso56 committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    e4e3a59 View commit details
    Browse the repository at this point in the history

  7. Fix null pointer exception after clear command 

    * Fixed a bug where null pointer exception is thrown in ProfileCardPanel after executing clear command
when there is no profile login
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    5614b3f View commit details
    Browse the repository at this point in the history

  8. Fix profile panels label duplication 

    * Fixed the profile panels label duplication where each update or clear execution will instantiate new Profile Panels objects
by rewriting the UI update logic of the profile panels when clear/update operations are executed.
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    b503320 View commit details
    Browse the repository at this point in the history

  9. Fix divider for profile panels 

    * Fixed the divider for profile panels so that users cannot adjust.
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    bb75677 View commit details
    Browse the repository at this point in the history

  10. Fix FXML filename typo in CommanderBmiStatsWindow 

    * Fixed FXML filename typo that caused Jar file to fail
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    a3eada4 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'branch-BugFixes' into branch-Documentation 

    * branch-BugFixes: (72 commits)
  Fix FXML filename typo in CommanderBmiStatsWindow
  Fix divider for profile panels
  Fix profile panels label duplication
  Fix null pointer exception after clear command
  Update ppp
  Edit PPP links in AboutUs
  Add PPP draft
  update ppp
  Update ppp
  PPP draft
  no message
  isSamePerson checks for ID only
  Ug typo fix for create profile
  Revert "Remove tags from storage and Day"
  Removed tags
  Remove tags from storage and Day
  Remove print statement
  Bug fix
  Update dg
  Fix PieChart not updated when new profile is created
  ...
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    25d23fc View commit details
    Browse the repository at this point in the history

  12. Merge branch 'branch-BugFixes' into branch-TestCases 

    * branch-BugFixes: (183 commits)
  Fix FXML filename typo in CommanderBmiStatsWindow
  Fix divider for profile panels
  Fix profile panels label duplication
  Fix null pointer exception after clear command
  Update ppp
  Edit PPP links in AboutUs
  Add PPP draft
  update ppp
  Update ppp
  PPP draft
  no message
  isSamePerson checks for ID only
  Ug typo fix for create profile
  Revert "Remove tags from storage and Day"
  Removed tags
  Remove tags from storage and Day
  Remove print statement
  Bug fix
  Update dg
  Fix PieChart not updated when new profile is created
  ...
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    cbae2ff View commit details
    Browse the repository at this point in the history

  13. Add more test cases for stats command 

    * Added more test cases to test commander stats
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    63030a9 View commit details
    Browse the repository at this point in the history

  14. Update User Guide with new sections 

    * Updated SampleDataUtil to have a more realistic data for new users
* Updated Getting Started section with an updated UI and edited basic commands section
* Added a new section under Features to include features for commanders
* Added a 'before you proceed warning' under features to warn users to login first
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    55b0f1d View commit details
    Browse the repository at this point in the history

  15. More test cases and util classes

    @hoperawr
    hoperawr committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    5cb7e97 View commit details
    Browse the repository at this point in the history

  16. Fix null pointer exception when adding a new day without login 

    * Fixed the null pointer exception when the user tries to add a new day without logging in; no Person object created before login
    @junhui-phoon
    junhui-phoon committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    d0406b0 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #233 from hoperawr/branch-StorageTests 

    Updating storage tests
    @junhui-phoon
    junhui-phoon authored Nov 7, 2020
    Configuration menu
    Copy the full SHA
    e46323f View commit details
    Browse the repository at this point in the history

  18. Merge pull request #232 from ethanso56/ethan-update-dg 

    update dg
    @junhui-phoon
    junhui-phoon authored Nov 7, 2020
    Configuration menu
    Copy the full SHA
    b259799 View commit details
    Browse the repository at this point in the history

  19. PaserUtil test

    Wayne committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    a3bdc4c View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp

    Wayne committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    a1adf85 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' into Testing 

    * master: (21 commits)
  More test cases and util classes
  Update dg and uidiagram
  Update ppp
  no message
  AdaptedInput and output test cases
  Edit PPP links in AboutUs
  Add PPP draft
  update ppp
  Update ppp
  Update dg
  PPP draft
  Update dg
  no message
  isSamePerson checks for ID only
  Ug typo fix for create profile
  Revert "Remove tags from storage and Day"
  Removed tags
  Remove tags from storage and Day
  Remove print statement
  Bug fix
  ...

# Conflicts:
#	src/main/java/seedu/address/logic/commands/ChangeCommand.java
#	src/main/java/seedu/address/model/day/Day.java
#	src/test/java/seedu/address/logic/parser/ParserUtilTest.java
#	src/test/java/seedu/address/testutil/DayBuilder.java
    Wayne committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    8f2d104 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2020

  1. More test cases

    @hoperawr
    hoperawr committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    23735f6 View commit details
    Browse the repository at this point in the history

  2. New line EOF

    @hoperawr
    hoperawr committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    d391826 View commit details
    Browse the repository at this point in the history

  3. user prefs

    @hoperawr
    hoperawr committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    9b48443 View commit details
    Browse the repository at this point in the history

  4. not sure why its failing

    @hoperawr
    hoperawr committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    47fecaa View commit details
    Browse the repository at this point in the history

  5. Merge pull request #242 from hoperawr/branch-StorageTests 

    More test cases
    @hoperawr
    hoperawr authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    2290215 View commit details
    Browse the repository at this point in the history

  6. ChangeCommandParser test

    Wayne committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    b78e806 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp

    Wayne committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    955200f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into Testing 

    * master:
  not sure why its failing
  user prefs
  New line EOF
  More test cases

# Conflicts:
#	src/test/java/seedu/address/testutil/TypicalDays.java
    Wayne committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    082a61a View commit details
    Browse the repository at this point in the history

  9. Merge pull request #234 from junhui-phoon/branch-BugFixes 

    Multiple Bug Fixes
    @ethanso56
    ethanso56 authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    0ade107 View commit details
    Browse the repository at this point in the history

  10. Remaining commands parser test

    Wayne committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    bcc782d View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp

    Wayne committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    58035f2 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into Testing 

    * master:
  Fix null pointer exception when adding a new day without login
  Fix FXML filename typo in CommanderBmiStatsWindow
  Fix divider for profile panels
  Fix profile panels label duplication
  Fix null pointer exception after clear command

# Conflicts:
#	src/main/java/seedu/address/logic/commands/AddCommand.java
    Wayne committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    4ec753b View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into branch-Documentation 

    * master:
  not sure why its failing
  user prefs
  New line EOF
  More test cases
  Fix null pointer exception when adding a new day without login
  More test cases and util classes
  Update dg and uidiagram
  no message
  AdaptedInput and output test cases
  Update dg
  Update dg
    @junhui-phoon
    junhui-phoon committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    8e4610c View commit details
    Browse the repository at this point in the history

  14. PPP draft 1

    @jiaax
    jiaax committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    c759dc6 View commit details
    Browse the repository at this point in the history

  15. Merge commit 'c759dc66de06972feadcd4529b41a56ec6ee5486' 

    * commit 'c759dc66de06972feadcd4529b41a56ec6ee5486':
  PPP draft 1
  PPP draft 1
    @jiaax
    jiaax committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    536242e View commit details
    Browse the repository at this point in the history

  16. Userguide changes for find and login

    @jiaax
    jiaax committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    12ff079 View commit details
    Browse the repository at this point in the history

  17. refactored targetWeight to startingWeight

    @jiaax
    jiaax committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    7b2e7aa View commit details
    Browse the repository at this point in the history

  18. View and update profile edited for DG, find needs to be added tmr

    @jiaax
    jiaax committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    00a2b34 View commit details
    Browse the repository at this point in the history

  19. Test cases for update command

    @hoperawr
    hoperawr committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    ad9f458 View commit details
    Browse the repository at this point in the history

  20. Test for calorie, remove and change command

    Wayne committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    f1ea305 View commit details
    Browse the repository at this point in the history

  21. -

    Wayne committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    6582420 View commit details
    Browse the repository at this point in the history

  22. DG diagrams

    @junhui-phoon
    junhui-phoon committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    4cf7d3e View commit details
    Browse the repository at this point in the history

  23. Update DG

    @junhui-phoon
    junhui-phoon committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    4b8ba25 View commit details
    Browse the repository at this point in the history

  24. Fix Sample Data bug

    @junhui-phoon
    junhui-phoon committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    decda0a View commit details
    Browse the repository at this point in the history

  25. Add Ui Class Diagrams

    @junhui-phoon
    junhui-phoon committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    838c143 View commit details
    Browse the repository at this point in the history

  26. Fix repetitive code block

    @junhui-phoon
    junhui-phoon committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    357f8b4 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #246 from junhui-phoon/branch-SampleDataFix 

    Fix Sample Data bug
    @junhui-phoon
    junhui-phoon authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    bad46b7 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #239 from junhui-phoon/branch-TestCases 

    Improve Code Coverage
    @junhui-phoon
    junhui-phoon authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    4454d94 View commit details
    Browse the repository at this point in the history

  29. UG changes

    @hoperawr
    hoperawr committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    f7584c8 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. Edit UI Component section of DG

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    287c6c0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into branch-Documentation 

    * master:
  Fix repetitive code block
  Fix Sample Data bug
  Add more test cases for stats command

# Conflicts:
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    d73d5b0 View commit details
    Browse the repository at this point in the history

  3. Edit Logic Component section of DG and other misc fixes 

    * Changed the Ui screenshot
* Edited index.md and README.md
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a89d347 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #240 from junhui-phoon/branch-Documentation 

    Update User Guide / Developer Guide
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    d235c32 View commit details
    Browse the repository at this point in the history

  5. Edit Ui.png 

    Updated the UI screenshot
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    91c364b View commit details
    Browse the repository at this point in the history

  6. Fix markdown errors

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3fa28ce View commit details
    Browse the repository at this point in the history

  7. Re-enable CodeCov checks

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6c73dd7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #248 from junhui-phoon/branch-Documentation 

    Fix markdown syntax errors and Re-enable CodeCov Checks
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    4353b0a View commit details
    Browse the repository at this point in the history

  9. Add contribution label to the UG

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    fefd001 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #249 from junhui-phoon/branch-Documentation 

    Add contribution label to the UG
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    354b869 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into branch-PPPDraft 

    * master: (34 commits)
  Add contribution label to the UG
  Re-enable CodeCov checks
  Fix markdown errors
  Edit Ui.png
  Edit Logic Component section of DG and other misc fixes
  Edit UI Component section of DG
  Fix repetitive code block
  Add Ui Class Diagrams
  Fix Sample Data bug
  Update DG
  DG diagrams
  not sure why its failing
  user prefs
  New line EOF
  More test cases
  Fix null pointer exception when adding a new day without login
  More test cases and util classes
  Update User Guide with new sections
  Add more test cases for stats command
  Fix FXML filename typo in CommanderBmiStatsWindow
  ...
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    dc0c166 View commit details
    Browse the repository at this point in the history

  12. Remove prefex tag

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    b6732bb View commit details
    Browse the repository at this point in the history

  13. Merge pull request #247 from hoperawr/branch-UG 

    UG changes
    @ethanso56
    ethanso56 authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    64c085d View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    56df1d8 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' into Testing 

    * master:
  Add contribution label to the UG
  Re-enable CodeCov checks
  Fix markdown errors
  Edit Ui.png
  Edit Logic Component section of DG and other misc fixes
  Edit UI Component section of DG
  UG changes
  Fix repetitive code block
  Add Ui Class Diagrams
  Fix Sample Data bug
  Update DG
  DG diagrams
  Update User Guide with new sections
  Add more test cases for stats command
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5a8ad00 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp … 

    …into branch-UGDG

* 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp:
  Add contribution label to the UG
  Re-enable CodeCov checks
  Fix markdown errors
  Edit Ui.png
  Edit Logic Component section of DG and other misc fixes
  Edit UI Component section of DG
  UG changes
  Fix repetitive code block
  Add Ui Class Diagrams
  Fix Sample Data bug
  Update DG
  DG diagrams
  Update User Guide with new sections
  Add more test cases for stats command
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    1fd8f9b View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp 

    * 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp:
  Add contribution label to the UG
  Re-enable CodeCov checks
  Fix markdown errors
  Edit Ui.png
  Edit Logic Component section of DG and other misc fixes
  Edit UI Component section of DG
  UG changes
  Fix repetitive code block
  Add Ui Class Diagrams
  Fix Sample Data bug
  Update DG
  DG diagrams
  Update User Guide with new sections
  Add more test cases for stats command
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    47df4cb View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' into branch-PPPDraft 

    * master:
  UG changes
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    115e080 View commit details
    Browse the repository at this point in the history

  19. Edit PPP and other misc typo 

    * Fix typo in the java classes
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    7b7caf2 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #250 from junhui-phoon/branch-PPPDraft 

    Edit PPP
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    eeaaee5 View commit details
    Browse the repository at this point in the history

  21. update ug

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6fffdae View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    229d90a View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' into Testing 

    * master:
  Edit PPP and other misc typo
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    7f3e2de View commit details
    Browse the repository at this point in the history

  24. minor bug fix

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    33a42bd View commit details
    Browse the repository at this point in the history

  25. CI error

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    c07a075 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #251 from ethanso56/ethan-update-ug 

    update ug
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    99a5930 View commit details
    Browse the repository at this point in the history

  27. checkstyle

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3ba3490 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    2fd6fbe View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' into Testing 

    * master:
  update ug
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    2df536c View commit details
    Browse the repository at this point in the history

  30. Merge pull request #243 from wayne987/Testing 

    Testing
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    4b13148 View commit details
    Browse the repository at this point in the history

  31. no message

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    ed33aa1 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'master' into branch-TestCases 

    * master: (38 commits)
  checkstyle
  minor bug fix
  update ug
  Edit PPP and other misc typo
  Add contribution label to the UG
  Re-enable CodeCov checks
  Fix markdown errors
  Edit Ui.png
  Edit Logic Component section of DG and other misc fixes
  Edit UI Component section of DG
  UG changes
  Fix repetitive code block
  Add Ui Class Diagrams
  Fix Sample Data bug
  Update DG
  DG diagrams
  -
  Test for calorie, remove and change command
  Remaining commands parser test
  ChangeCommandParser test
  ...
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    c5b6125 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp 

    # Conflicts:
#	docs/UserGuide.md
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5378af4 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'master' into USER_GUIDE 

    * master:
  no message
  checkstyle
  minor bug fix
  -
  Test for calorie, remove and change command
  Remaining commands parser test
  ChangeCommandParser test
  PaserUtil test
  test CalorieCommand and RemoveCommand parser
  Test Bmi and Calorie related methods
  Exercise, Time, Food test
  Calorie, Input, Output test
  CalorieCount and CalorieManager Test
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    eafb215 View commit details
    Browse the repository at this point in the history

  35. UG - getting started

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    f5c6c81 View commit details
    Browse the repository at this point in the history

  36. edit diagram

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a30665d View commit details
    Browse the repository at this point in the history

  37. merge master

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    ab24a7e View commit details
    Browse the repository at this point in the history

  38. Merge pull request #253 from ethanso56/ethan-testing 

    Removed prefix tag and edited daytest
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    0f71a1d View commit details
    Browse the repository at this point in the history

  39. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp … 

    …into branch-UGDG

* 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp:
  checkstyle
  minor bug fix
  update ug
  Edit PPP and other misc typo
  Remove prefex tag
  -
  Test for calorie, remove and change command
  Remaining commands parser test
  ChangeCommandParser test
  PaserUtil test
  test CalorieCommand and RemoveCommand parser
  Test Bmi and Calorie related methods
  Exercise, Time, Food test
  Calorie, Input, Output test
  CalorieCount and CalorieManager Test
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    45a2169 View commit details
    Browse the repository at this point in the history

  40. updated ug

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3bb9193 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    858e283 View commit details
    Browse the repository at this point in the history

  42. Merge branch 'master' into USER_GUIDE 

    * master:
  Remove prefex tag
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a5dadc0 View commit details
    Browse the repository at this point in the history

  43. Merge branch 'master' into ethan-update-dg

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    049eb09 View commit details
    Browse the repository at this point in the history

  44. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp 

    * 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp:
  checkstyle
  minor bug fix
  update ug
  Edit PPP and other misc typo
  Remove prefex tag
  -
  Test for calorie, remove and change command
  Remaining commands parser test
  ChangeCommandParser test
  PaserUtil test
  test CalorieCommand and RemoveCommand parser
  Test Bmi and Calorie related methods
  Exercise, Time, Food test
  Calorie, Input, Output test
  CalorieCount and CalorieManager Test
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    66710fc View commit details
    Browse the repository at this point in the history

  45. Merge branch 'master' into branch-UGDG 

    * master:
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    77418fb View commit details
    Browse the repository at this point in the history

  46. Merge pull request #254 from wayne987/USER_GUIDE 

    User Guide
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    25338d9 View commit details
    Browse the repository at this point in the history

  47. Merge branch 'master' into branch-UG

    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6d71d67 View commit details
    Browse the repository at this point in the history

  48. AddCommand Test

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    879d7a1 View commit details
    Browse the repository at this point in the history

  49. Update dg

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    e3d8717 View commit details
    Browse the repository at this point in the history

  50. Merge branch 'master' into ethan-update-dg

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    93c02bd View commit details
    Browse the repository at this point in the history

  51. EditCommand and DeleteCommand Test

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    71cff5c View commit details
    Browse the repository at this point in the history

  52. Merge pull request #252 from hoperawr/branch-UG 

    UG - getting started
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    923344e View commit details
    Browse the repository at this point in the history

  53. Fix code quality issues 

    * MainWindow.java: abstracted profile change code block in execute method
* CommandResult.java: added missing parameter for equals method
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    15d704e View commit details
    Browse the repository at this point in the history

  54. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp 

    * 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp:
  updated ug
  UG - getting started
  no message
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    fc97fd4 View commit details
    Browse the repository at this point in the history

  55. Merge branch 'master' into branch-UGDG 

    * master:
  updated ug
  UG - getting started
  no message
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    333d2d3 View commit details
    Browse the repository at this point in the history

  56. Merge branch 'branch-CodeQuality' into branch-TestCases 

    * branch-CodeQuality:
  Fix code quality issues
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    e11f73a View commit details
    Browse the repository at this point in the history

  57. CreateCommand and LoginCommand Test

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6bd6822 View commit details
    Browse the repository at this point in the history

  58. Fix UML diagrams

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    9d25d24 View commit details
    Browse the repository at this point in the history

  59. update docs

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    96f977e View commit details
    Browse the repository at this point in the history

  60. Edit PPP

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    daa7287 View commit details
    Browse the repository at this point in the history

  61. Merge pull request #256 from junhui-phoon/branch-Documentation 

    Fix UML diagrams
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    132929c View commit details
    Browse the repository at this point in the history

  62. Merge branch 'master' into Test_Cases_Days 

    * master:
  Fix UML diagrams
  UG - getting started
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    09f7c27 View commit details
    Browse the repository at this point in the history

  63. Merge pull request #257 from junhui-phoon/branch-PPPDraft 

    Edit PPP
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    591e3ed View commit details
    Browse the repository at this point in the history

  64. Fix clear and commandresult test cases

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8b67c3c View commit details
    Browse the repository at this point in the history

  65. Person test

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    71c5223 View commit details
    Browse the repository at this point in the history

  66. Merge branch 'master' into Test_Cases_Days 

    * master:
  Edit PPP
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    819a7dc View commit details
    Browse the repository at this point in the history

  67. checkstyle

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    d356dcd View commit details
    Browse the repository at this point in the history

  68. Merge branch 'master' into branch-BugFixes 

    * master: (44 commits)
  Edit PPP
  Fix UML diagrams
  updated ug
  UG - getting started
  no message
  checkstyle
  minor bug fix
  update ug
  Edit PPP and other misc typo
  Remove prefex tag
  Add contribution label to the UG
  Re-enable CodeCov checks
  Fix markdown errors
  Edit Ui.png
  Edit Logic Component section of DG and other misc fixes
  Edit UI Component section of DG
  UG changes
  Fix repetitive code block
  Add Ui Class Diagrams
  Fix Sample Data bug
  ...
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    e4284e3 View commit details
    Browse the repository at this point in the history

  69. no message

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8ec5d6d View commit details
    Browse the repository at this point in the history

  70. Merge pull request #259 from junhui-phoon/branch-TestCases 

    Fix test cases
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    84ec9d3 View commit details
    Browse the repository at this point in the history

  71. Merge

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    1712ec1 View commit details
    Browse the repository at this point in the history

  72. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp … 

    …into branch-UGDG

# Conflicts:
#	docs/images/Ui.png
    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    b27e372 View commit details
    Browse the repository at this point in the history

  73. Fix bug where storage file is not loaded when a profile has empty day

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    fae962e View commit details
    Browse the repository at this point in the history

  74. DG

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    37d5492 View commit details
    Browse the repository at this point in the history

  75. EOL

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8408d27 View commit details
    Browse the repository at this point in the history

  76. Merge pull request #263 from junhui-phoon/branch-BugFixes 

    Fix storage bug
    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    2cdde6c View commit details
    Browse the repository at this point in the history

  77. Merge pull request #262 from hoperawr/branch-UGDG 

    DG
    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    d0d7170 View commit details
    Browse the repository at this point in the history

  78. Merge branch 'master' into branch-UpdateProfile

    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    7512de7 View commit details
    Browse the repository at this point in the history

  79. removed print command

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    84d3fa0 View commit details
    Browse the repository at this point in the history

  80. Merge branch 'branch-UpdateProfile' of https://github.com/hoperawr/tp … 

    …into branch-UpdateProfile

# Conflicts:
#	src/main/java/seedu/address/logic/parser/UpdateCommandParser.java
    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    694cfdc View commit details
    Browse the repository at this point in the history

  81. Not sure what's happening

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    dc91d61 View commit details
    Browse the repository at this point in the history

  82. Merge pull request #245 from hoperawr/branch-UpdateProfile 

    Test cases for update command
    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    95ce6d3 View commit details
    Browse the repository at this point in the history

  83. fix dg conflicts

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    0414f40 View commit details
    Browse the repository at this point in the history

  84. updated Ug and Dg

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    2da6c04 View commit details
    Browse the repository at this point in the history

  85. PPP

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    4c437c7 View commit details
    Browse the repository at this point in the history

  86. Merge pull request #264 from hoperawr/branch-PPP 

    PPP
    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a2740ec View commit details
    Browse the repository at this point in the history

  87. no message

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    f78eabf View commit details
    Browse the repository at this point in the history

  88. DG

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5db3f24 View commit details
    Browse the repository at this point in the history

  89. Merge branch 'master' into Developer_Guide 

    * master:
  PPP
  Not sure what's happening
  removed print command
  EOL
  DG
  Fix bug where storage file is not loaded when a profile has empty day
  Merge
  no message
  Fix clear and commandresult test cases
  Fix code quality issues
  Test cases for update command
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    60060f7 View commit details
    Browse the repository at this point in the history

  90. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp … 

    …into branch-UGDG

* 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp:
  PPP
  Not sure what's happening
  removed print command
  EOL
  DG
  Fix bug where storage file is not loaded when a profile has empty day
  Merge
  no message
  Fix clear and commandresult test cases
  Edit PPP
  Fix UML diagrams
  Fix code quality issues
  Test cases for update command

# Conflicts:
#	docs/DeveloperGuide.md
#	src/main/java/seedu/address/logic/commands/UpdateCommand.java
p4
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    f56ca6a View commit details
    Browse the repository at this point in the history

  91. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp 

    * 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp:
  PPP
  Not sure what's happening
  removed print command
  EOL
  DG
  Fix bug where storage file is not loaded when a profile has empty day
  Merge
  no message
  Fix clear and commandresult test cases
  Edit PPP
  Fix UML diagrams
  Fix code quality issues
  Test cases for update command
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8354351 View commit details
    Browse the repository at this point in the history

  92. Fix startingDate to actual current date

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    13d6bd7 View commit details
    Browse the repository at this point in the history

  93. Merge branch 'master' into branch-UGDG 

    * master:
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    319f3db View commit details
    Browse the repository at this point in the history

  94. Merge pull request #265 from wayne987/Developer_Guide 

    Developer guide
    @wayne987
    wayne987 authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    2a3af34 View commit details
    Browse the repository at this point in the history

  95. Fix checkstyle errors

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8be31a1 View commit details
    Browse the repository at this point in the history

  96. Merge branch 'master' into branch-BugFixes 

    * master:
  DG
  PPP
  Not sure what's happening
  removed print command
  EOL
  DG
  Merge
  no message
  Fix clear and commandresult test cases
  Fix code quality issues
  Test cases for update command
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    20986d3 View commit details
    Browse the repository at this point in the history

  97. no message

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5eaf6a7 View commit details
    Browse the repository at this point in the history

  98. Merge pull request #266 from junhui-phoon/branch-BugFixes 

    v1.4 pre bug test
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3bc641e View commit details
    Browse the repository at this point in the history

  99. Fix typo in DayCard that cause a bug

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5e95dd8 View commit details
    Browse the repository at this point in the history

  100. error message

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5f4051e View commit details
    Browse the repository at this point in the history

  101. UG draft

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    7b1adf7 View commit details
    Browse the repository at this point in the history

  102. Merge branch 'master' into branch-UGDG

    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6ebe5a4 View commit details
    Browse the repository at this point in the history

  103. Merge pull request #244 from jiaax/branch-UGDG 

    Branch ugdg
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8e06258 View commit details
    Browse the repository at this point in the history

  104. Merge pull request #258 from ethanso56/ethan-update-dg 

    update docs + additional
    @ethanso56
    ethanso56 authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    72e8c0e View commit details
    Browse the repository at this point in the history

  105. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3fbb403 View commit details
    Browse the repository at this point in the history

  106. Merge branch 'master' into branch-BugFixes 

    * master:
  UG draft
  Fix typo in DayCard that cause a bug
  no message
  no message
  updated Ug and Dg
  update docs
  Update dg
  edit diagram
  CI error
  View and update profile edited for DG, find needs to be added tmr
  refactored targetWeight to startingWeight
  Userguide changes for find and login
  PPP draft 1
  PPP draft 1
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    52553ea View commit details
    Browse the repository at this point in the history

  107. Fix refactoring typos

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    1410860 View commit details
    Browse the repository at this point in the history

  108. Merge pull request #267 from junhui-phoon/master 

    Fix typo in DayCard that cause a bug
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    f172f1a View commit details
    Browse the repository at this point in the history

  109. Merge pull request #268 from junhui-phoon/branch-BugFixes 

    Branch bug fixes
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a22592e View commit details
    Browse the repository at this point in the history

  110. Ug screenshots

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    4a5bce5 View commit details
    Browse the repository at this point in the history

  111. Merge branch 'master' into branch-UGDG2 

    * master:
  Fix refactoring typos
  Fix typo in DayCard that cause a bug
    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    b3ce544 View commit details
    Browse the repository at this point in the history

  112. bug fix

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6d008b4 View commit details
    Browse the repository at this point in the history

  113. Merge branch 'master' into Bug_Fix 

    * master:
  Fix refactoring typos
  UG draft
  Fix typo in DayCard that cause a bug
  no message
  no message
  updated Ug and Dg
  update docs
  Update dg
  edit diagram
  CI error
  View and update profile edited for DG, find needs to be added tmr
  refactored targetWeight to startingWeight
  Userguide changes for find and login
  PPP draft 1
  PPP draft 1

# Conflicts:
#	src/main/java/seedu/address/logic/commands/LoginCommand.java
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5258034 View commit details
    Browse the repository at this point in the history

  114. edit day

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    05d0d13 View commit details
    Browse the repository at this point in the history

  115. Update junhui-phoon.md

    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    d9675b2 View commit details
    Browse the repository at this point in the history

  116. checkstyle

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    fe5cc36 View commit details
    Browse the repository at this point in the history

  117. UG DG

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    540592e View commit details
    Browse the repository at this point in the history

  118. Merge pull request #270 from jiaax/branch-UGDG2 

    Updated UG
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a24f81b View commit details
    Browse the repository at this point in the history

  119. case sensitive

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    e8f4010 View commit details
    Browse the repository at this point in the history

  120. Merge branch 'master' of https://github.com/AY2021S1-CS2103T-W11-3/tp … 

    …into branch-PPP
    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    2125964 View commit details
    Browse the repository at this point in the history

  121. update ug

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    ea9f259 View commit details
    Browse the repository at this point in the history

  122. Merge branch 'master' into Bug_Fix 

    * master:
  Update junhui-phoon.md
  edit day
  Ug screenshots
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    9a2bdb4 View commit details
    Browse the repository at this point in the history

  123. Merge branch 'master' into PPP 

    * master:
  Update junhui-phoon.md
  edit day
  Ug screenshots
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6b2dc1f View commit details
    Browse the repository at this point in the history

  124. Merge branch 'master' into ethan-update-ug

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    f5f0206 View commit details
    Browse the repository at this point in the history

  125. Update junhui-phoon.md

    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a5951b7 View commit details
    Browse the repository at this point in the history

  126. PPP

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    43a97e1 View commit details
    Browse the repository at this point in the history

  127. Merge pull request #272 from ethanso56/ethan-update-ug 

    update ug
    @ethanso56
    ethanso56 authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    4a8e3ca View commit details
    Browse the repository at this point in the history

  128. Update UI.png

    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    4de19bf View commit details
    Browse the repository at this point in the history

  129. ppp

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    1ab2c94 View commit details
    Browse the repository at this point in the history

  130. Merge pull request #271 from hoperawr/branch-PPP 

    UG DG
    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    7b933e8 View commit details
    Browse the repository at this point in the history

  131. ppp

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5d8e035 View commit details
    Browse the repository at this point in the history

  132. ppp

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    edd8b6d View commit details
    Browse the repository at this point in the history

  133. Merge branch 'master' into branch-BugFixes 

    * master:
  Update UI.png
  PPP
  Update junhui-phoon.md
  update ug
  UG DG
  Update junhui-phoon.md
  edit day
  Ug screenshots
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    dff9bd9 View commit details
    Browse the repository at this point in the history

  134. Merge pull request #273 from wayne987/PPP 

    Ppp
    @wayne987
    wayne987 authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    14ea24a View commit details
    Browse the repository at this point in the history

  135. Formatting

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    59660e3 View commit details
    Browse the repository at this point in the history

  136. DG edits

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    9aa356f View commit details
    Browse the repository at this point in the history

  137. Merge branch 'master' into Test_Cases_Days

    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    840c96e View commit details
    Browse the repository at this point in the history

  138. Merge pull request #274 from hoperawr/branch-PPP 

    Formatting
    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    4d9ef04 View commit details
    Browse the repository at this point in the history

  139. Merge pull request #269 from wayne987/Bug_Fix 

    Bug fix
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    7bb0795 View commit details
    Browse the repository at this point in the history

  140. update ppp

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    851ac72 View commit details
    Browse the repository at this point in the history

  141. Merge pull request #275 from jiaax/branch-DG 

    DG edits
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8af2f43 View commit details
    Browse the repository at this point in the history

  142. Merge pull request #276 from ethanso56/ethan-update-ug 

    update ppp
    @ethanso56
    ethanso56 authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    e2a5a5d View commit details
    Browse the repository at this point in the history

  143. Merge branch 'master' into branch-BugFixes 

    * master:
  update ppp
  DG edits
  Formatting
  ppp
  ppp
  ppp
  case sensitive
  checkstyle
  bug fix
  error message
    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    84f76f2 View commit details
    Browse the repository at this point in the history

  144. Small changes in documentation

    @hoperawr
    hoperawr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    166fe77 View commit details
    Browse the repository at this point in the history

  145. PPP

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    31056d1 View commit details
    Browse the repository at this point in the history

  146. Merge pull request #277 from hoperawr/branch-PPP 

    Small changes in documentation
    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6c1bbe2 View commit details
    Browse the repository at this point in the history

  147. Merge pull request #278 from jiaax/branch-ppp 

    PPP
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    e681328 View commit details
    Browse the repository at this point in the history

  148. subheading edits

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    d76ddc6 View commit details
    Browse the repository at this point in the history

  149. Merge pull request #279 from jiaax/branch-DGUpdate 

    subheading edits
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3396dec View commit details
    Browse the repository at this point in the history

  150. Merge branch 'master' into Test_Cases_Days 

    * master: (50 commits)
  subheading edits
  PPP
  Small changes in documentation
  update ppp
  DG edits
  Formatting
  ppp
  ppp
  ppp
  Update UI.png
  PPP
  Update junhui-phoon.md
  update ug
  case sensitive
  UG DG
  checkstyle
  Update junhui-phoon.md
  edit day
  bug fix
  Ug screenshots
  ...

# Conflicts:
#	src/main/java/seedu/address/logic/commands/AddCommand.java
#	src/main/java/seedu/address/logic/commands/LoginCommand.java
#	src/main/java/seedu/address/logic/parser/LoginCommandParser.java
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5038df1 View commit details
    Browse the repository at this point in the history

  151. Merge branch 'Test_Cases_Days' of https://github.com/wayne987/tp into… 

    … Test_Cases_Days

* 'Test_Cases_Days' of https://github.com/wayne987/tp:

# Conflicts:
#	src/main/java/seedu/address/logic/commands/LoginCommand.java
    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    19356e4 View commit details
    Browse the repository at this point in the history

  152. Fix BMI progress bar not updated in Ui

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    30ab8cf View commit details
    Browse the repository at this point in the history

  153. Fix JavaFX 11 warnings and updated app version

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    55540c3 View commit details
    Browse the repository at this point in the history

  154. Merge pull request #280 from junhui-phoon/branch-BugFixes 

    Final Bug fixes
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    44dd6a2 View commit details
    Browse the repository at this point in the history

  155. fix

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    1c754fc View commit details
    Browse the repository at this point in the history

  156. page breaks

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    70f8aaa View commit details
    Browse the repository at this point in the history

  157. PPP intro edit lol

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    2781721 View commit details
    Browse the repository at this point in the history

  158. fix

    Wayne committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    6c084ce View commit details
    Browse the repository at this point in the history

  159. Merge pull request #281 from jiaax/branch-pdfformat 

    page breaks
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    7c5586a View commit details
    Browse the repository at this point in the history

  160. Merge pull request #260 from wayne987/Test_Cases_Days 

    More test cases
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3acc5a5 View commit details
    Browse the repository at this point in the history

  161. no message

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    266003b View commit details
    Browse the repository at this point in the history

  162. Merge pull request #282 from jiaax/branch-FINAL 

    UGDG pdf edits
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    237d8f7 View commit details
    Browse the repository at this point in the history

  163. no message

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    dd03a51 View commit details
    Browse the repository at this point in the history

  164. Fix default profile appearing after clear

    @junhui-phoon
    junhui-phoon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    cdabc2a View commit details
    Browse the repository at this point in the history

  165. update ug

    @ethanso56
    ethanso56 committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    316a749 View commit details
    Browse the repository at this point in the history

  166. Merge pull request #283 from jiaax/branch-FINAL 

    FINAL PPP
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    c265001 View commit details
    Browse the repository at this point in the history

  167. Merge pull request #284 from junhui-phoon/branch-easterEggFix 

    Fix default profile appearing after clear
    @junhui-phoon
    junhui-phoon authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    7091d09 View commit details
    Browse the repository at this point in the history

  168. Merge pull request #286 from ethanso56/ethan-update-ug 

    update ug
    @ethanso56
    ethanso56 authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a3b1879 View commit details
    Browse the repository at this point in the history

  169. Update hoperawr.md

    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    58100f1 View commit details
    Browse the repository at this point in the history

  170. Merge pull request #287 from AY2021S1-CS2103T-W11-3/hoperawr-patch-1 

    Update hoperawr.md
    @hoperawr
    hoperawr authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    087d33c View commit details
    Browse the repository at this point in the history

  171. wayne

    @jiaax
    jiaax committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    c9b1be2 View commit details
    Browse the repository at this point in the history

  172. Merge pull request #288 from jiaax/branch-FINAL 

    wayne
    @jiaax
    jiaax authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    94d0698 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. missing bracket in cmd summary

    @ethanso56
    ethanso56 committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    a804df2 View commit details
    Browse the repository at this point in the history

  2. UG changes

    @hoperawr
    hoperawr committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    f6d51a6 View commit details
    Browse the repository at this point in the history

  3. Ug changes

    @hoperawr
    hoperawr committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    f51d465 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #289 from hoperawr/branch-UG 

    UG changes
    @hoperawr
    hoperawr authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    c2f7254 View commit details
    Browse the repository at this point in the history

  5. UG

    @hoperawr
    hoperawr committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    8a729fd View commit details
    Browse the repository at this point in the history

  6. Merge pull request #290 from hoperawr/branch-UG 

    UG
    @hoperawr
    hoperawr authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    ac2b0d7 View commit details
    Browse the repository at this point in the history

  7. UG

    @hoperawr
    hoperawr committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    2c2b366 View commit details
    Browse the repository at this point in the history

  8. UG

    @hoperawr
    hoperawr committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    7cf6edd View commit details
    Browse the repository at this point in the history

  9. Merge pull request #291 from hoperawr/branch-UG 

    UG
    @hoperawr
    hoperawr authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    2c9e994 View commit details
    Browse the repository at this point in the history

  10. UG

    @hoperawr
    hoperawr committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    07146c0 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #292 from hoperawr/branch-UG 

    UG
    @hoperawr
    hoperawr authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    e680533 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into ethan-update-ug

    @ethanso56
    ethanso56 committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    3ab4460 View commit details
    Browse the repository at this point in the history

  13. update ug

    @ethanso56
    ethanso56 committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    f9b5bf6 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #293 from ethanso56/ethan-update-ug 

    Ethan update ug
    @ethanso56
    ethanso56 authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    82de4bd View commit details
    Browse the repository at this point in the history