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-T12-4] RestaurantBuddy #35

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

Commits on Sep 30, 2021

  1. Configuration menu
    Copy the full SHA
    9fcc12f View commit details
    Browse the repository at this point in the history
  2. Add details to AboutUs.md

    kairoskoh committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    3856130 View commit details
    Browse the repository at this point in the history
  3. Add name

    leecheokfeng committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    508fd89 View commit details
    Browse the repository at this point in the history
  4. changed name

    Cesare4869 committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    2ecf37f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #3 from leecheokfeng/leeCheokFeng-AboutUs

    Add individual name and github username
    Cesare4869 authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    ffaeb2e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9a54eeb View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1 from jerrelllzw/jerrellLow-AboutUs

    Added details to the docs/AboutUs.md page
    jerrelllzw authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    b3a78bb View commit details
    Browse the repository at this point in the history
  8. resolve conflicts

    Cesare4869 committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    0ab60ef View commit details
    Browse the repository at this point in the history
  9. Merge pull request #2 from kairoskoh/kairosKoh-AboutUs

    Add details to AboutUs.md
    jerrelllzw authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    85d386c View commit details
    Browse the repository at this point in the history
  10. merged conflict zehang

    Cesare4869 committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    058e823 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    4236bc6 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2021

  1. new change in aboutus

    Cesare4869 committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    d89d208 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #15 from Cesare4869/Zehang-AboutUs

    new change in aboutus
    Cesare4869 authored Oct 6, 2021
    Configuration menu
    Copy the full SHA
    d2490b6 View commit details
    Browse the repository at this point in the history
  3. copy some ip code to tp

    Cesare4869 committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    f2b36eb View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. Configuration menu
    Copy the full SHA
    7e87353 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8501843 View commit details
    Browse the repository at this point in the history
  3. Add Employee.java

    Add EmployeeList.java
    Add EmployeeParser.java
    kairoskoh committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    c4c5f20 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    36e1c16 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f4f2494 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    32aaa7a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a31cdb1 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #17 from kairoskoh/branch-week8-kairos

    Branch week8 kairos
    kairoskoh authored Oct 7, 2021
    Configuration menu
    Copy the full SHA
    0bf8634 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2021

  1. Configuration menu
    Copy the full SHA
    3b84a32 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #18 from kairoskoh/branch-week8-meeting

    Add new packages for ingredients and menu
    kairoskoh authored Oct 10, 2021
    Configuration menu
    Copy the full SHA
    53a3e83 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9650ce7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5b8616a View commit details
    Browse the repository at this point in the history
  5. add storage in main method

    Cesare4869 committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    ea74dc4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b799a4a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1f0f59e View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2021

  1. Merge pull request #19 from kairoskoh/branch-week8-kairos-employee

    Add remove and list functions for employee
    kairoskoh authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    07f92ba View commit details
    Browse the repository at this point in the history
  2. Merge pull request #23 from leecheokfeng/branch-week8-ingredient

    Create ingredient class and functions to list/remove/add
    kairoskoh authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    cef820d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #22 from Cesare4869/master

    Add storage for employee, menu and ingredient
    kairoskoh authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    f18c310 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-T12-4/tp

    …into Menu
    
    # Conflicts:
    #	src/main/java/seedu/duke/Duke.java
    jerrelllzw committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    05dfb7f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #20 from jerrelllzw/Menu

    Added MenuItem class and its related functions (add, remove, list)
    kairoskoh authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    6d5e3ab View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2774d62 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #25 from kairoskoh/branch-week9-meeting

    Refactor code to reduce number of lines of code in main method
    kairoskoh authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    cf46b0d View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    de2ccad View commit details
    Browse the repository at this point in the history
  9. Merge pull request #26 from leecheokfeng/branch-week8-ingredient

    Refactor ingredientParser to use printLine
    leecheokfeng authored Oct 11, 2021
    Configuration menu
    Copy the full SHA
    68951f0 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7c11b7e View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2c2181f View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    0e7d8e3 View commit details
    Browse the repository at this point in the history
  13. fix storage problem

    Cesare4869 committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    ac453c6 View commit details
    Browse the repository at this point in the history
  14. Merge branch 'Menu'

    jerrelllzw committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    3126520 View commit details
    Browse the repository at this point in the history
  15. - added jUnit test for MenuParser class

    - added code in gradle to enable assertions
    jerrelllzw committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    b1b11e2 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    846196e View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    94d9df2 View commit details
    Browse the repository at this point in the history
  18. -added MenuUi class for menu related messages to be printed

    -added invalid index error handling
    
    Fixes #29
    jerrelllzw committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    b5bf716 View commit details
    Browse the repository at this point in the history
  19. -added error handling for command inputs with invalid parameters

    -fully fixed the delete-menu bug where target index is invalid
    
    Fixes #31
    jerrelllzw committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    81b85e2 View commit details
    Browse the repository at this point in the history
  20. reformatted code

    jerrelllzw committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    5a9a955 View commit details
    Browse the repository at this point in the history
  21. -reformatted code

    jerrelllzw committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    dc87281 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. Configuration menu
    Copy the full SHA
    d55ed03 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2021

  1. add assertion in storage

    Cesare4869 committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    6323af5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1f36bf5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b194cf8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    afd0bf8 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #37 from leecheokfeng/branch-week9-ingredient-exce…

    …ptions
    
    Branch week9 ingredient exceptions
    jerrelllzw authored Oct 13, 2021
    Configuration menu
    Copy the full SHA
    e3cc03c View commit details
    Browse the repository at this point in the history
  6. Merge pull request #34 from kairoskoh/branch-week9-kairos

    Branch week9 kairos
    jerrelllzw authored Oct 13, 2021
    Configuration menu
    Copy the full SHA
    49ea04f View commit details
    Browse the repository at this point in the history
  7. Update MainParser.java

    jerrelllzw authored Oct 13, 2021
    Configuration menu
    Copy the full SHA
    741901b View commit details
    Browse the repository at this point in the history
  8. Merge pull request #33 from Cesare4869/master

    Fix storage and add assertions
    jerrelllzw authored Oct 13, 2021
    Configuration menu
    Copy the full SHA
    9793240 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-T12-4/tp

    …into Errors
    
    # Conflicts:
    #	src/main/java/seedu/duke/storage/Storage.java
    jerrelllzw committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    61853a8 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #32 from jerrelllzw/Errors

    Added error handling and menu UI
    jerrelllzw authored Oct 13, 2021
    Configuration menu
    Copy the full SHA
    f08adcb View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    79e73de View commit details
    Browse the repository at this point in the history
  12. Merge pull request #38 from jerrelllzw/Errors

    -corrected checkstyle errors
    jerrelllzw authored Oct 13, 2021
    Configuration menu
    Copy the full SHA
    f2fc79b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    71b7a2a View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2021

  1. Merge pull request #43 from jerrelllzw/Errors

    fixed a bug in removeMenu method where index is always invalid
    jerrelllzw authored Oct 14, 2021
    Configuration menu
    Copy the full SHA
    ab68137 View commit details
    Browse the repository at this point in the history
  2. -fixed menu related bugs

    -improved menu ui messages
    jerrelllzw committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    7907516 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d9365a0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b8269ff View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2021

  1. -started on user guide

    -renamed menu related classes for easier understanding
    jerrelllzw committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    95f81dc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    06182e2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fe4016c View commit details
    Browse the repository at this point in the history
  4. fixed checkstyle error

    jerrelllzw committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    a8d3108 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2021

  1. added promotion function

    jerrelllzw committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    ac4e118 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa1c227 View commit details
    Browse the repository at this point in the history
  3. added author comments

    jerrelllzw committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    0524188 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7b7d7d6 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2021

  1. Merge pull request #44 from jerrelllzw/Promotion

    Promotion
    jerrelllzw authored Oct 20, 2021
    Configuration menu
    Copy the full SHA
    147836e View commit details
    Browse the repository at this point in the history
  2. changed seperator

    jerrelllzw committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    3474206 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #45 from jerrelllzw/Promotion

    changed seperator
    jerrelllzw authored Oct 20, 2021
    Configuration menu
    Copy the full SHA
    24b7a76 View commit details
    Browse the repository at this point in the history
  4. finance and DG

    Cesare4869 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    2fa765e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    81e8cdc View commit details
    Browse the repository at this point in the history
  6. Merge pull request #46 from Cesare4869/master

    Have UG/DG, Finance and Dish
    Cesare4869 authored Oct 20, 2021
    Configuration menu
    Copy the full SHA
    12d9edb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e7153fc View commit details
    Browse the repository at this point in the history
  8. Merge pull request #47 from kairoskoh/master

    Add changes to developguide.md on employee package
    kairoskoh authored Oct 20, 2021
    Configuration menu
    Copy the full SHA
    b508dd2 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2021

  1. Merge branch 'Promotion'

    jerrelllzw committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    3729d19 View commit details
    Browse the repository at this point in the history
  2. edited developer guide

    jerrelllzw committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    a6af985 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #48 from jerrelllzw/master

    edited developer guide
    jerrelllzw authored Oct 21, 2021
    Configuration menu
    Copy the full SHA
    01d0cd0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4ce8dc2 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #50 from kairoskoh/master

    Add introduction and table of contents
    kairoskoh authored Oct 21, 2021
    Configuration menu
    Copy the full SHA
    7bcc3a4 View commit details
    Browse the repository at this point in the history
  6. Add employee UI

    kairoskoh committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    1f39f55 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #52 from kairoskoh/branch-week10-kairos

    Add employee UI
    kairoskoh authored Oct 21, 2021
    Configuration menu
    Copy the full SHA
    2c8ef3f View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2021

  1. -added hyper links to content page for user guide

    -added finance methods to user guide
    jerrelllzw committed Oct 23, 2021
    Configuration menu
    Copy the full SHA
    5de4bb9 View commit details
    Browse the repository at this point in the history
  2. updated user guide

    jerrelllzw committed Oct 23, 2021
    Configuration menu
    Copy the full SHA
    9af6d65 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #53 from jerrelllzw/Docs

    Docs
    jerrelllzw authored Oct 23, 2021
    Configuration menu
    Copy the full SHA
    83b9943 View commit details
    Browse the repository at this point in the history
  4. Update UserGuide.md

    jerrelllzw authored Oct 23, 2021
    Configuration menu
    Copy the full SHA
    2e16c92 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2021

  1. added indexing

    jerrelllzw committed Oct 25, 2021
    Configuration menu
    Copy the full SHA
    79ae5d9 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. Configuration menu
    Copy the full SHA
    9fee4ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7969215 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #58 from jerrelllzw/Docs

    Docs
    jerrelllzw authored Oct 26, 2021
    Configuration menu
    Copy the full SHA
    d6bcd9a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    226a331 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7e2be75 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #62 from leecheokfeng/branch-week10-ingredient

    Add ingredient price, find expired ingredients
    leecheokfeng authored Oct 26, 2021
    Configuration menu
    Copy the full SHA
    6c8ca99 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e962376 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #63 from leecheokfeng/branch-week11-ingredient

    Update UG to include ingredient price and expiry feature
    leecheokfeng authored Oct 26, 2021
    Configuration menu
    Copy the full SHA
    dc9af70 View commit details
    Browse the repository at this point in the history
  9. change dg

    Cesare4869 committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    68a7e82 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #64 from Cesare4869/master

    change dg
    Cesare4869 authored Oct 26, 2021
    Configuration menu
    Copy the full SHA
    a436880 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2021

  1. Configuration menu
    Copy the full SHA
    99e740c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #65 from jerrelllzw/master

    edited dg (user stories, target)
    jerrelllzw authored Oct 27, 2021
    Configuration menu
    Copy the full SHA
    98dab8a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6ce85de View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8fc12c4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bdc5b33 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #67 from jerrelllzw/Docs

    edited dg (added non funtioncal requirements and glossary)
    jerrelllzw authored Oct 27, 2021
    Configuration menu
    Copy the full SHA
    b49e7fc View commit details
    Browse the repository at this point in the history
  7. - removed error message on startup

    - added lines to wrap storage error messages
    jerrelllzw committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    d58ce40 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #68 from jerrelllzw/Docs

    - removed error message on startup
    jerrelllzw authored Oct 27, 2021
    Configuration menu
    Copy the full SHA
    6cc21e3 View commit details
    Browse the repository at this point in the history
  9. fixed dish storage bug

    jerrelllzw committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    8badfbe View commit details
    Browse the repository at this point in the history
  10. Merge pull request #69 from jerrelllzw/Docs

    fixed dish storage bug
    jerrelllzw authored Oct 27, 2021
    Configuration menu
    Copy the full SHA
    d56f963 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    190d7fd View commit details
    Browse the repository at this point in the history
  12. Update UI class

    kairoskoh committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    9b814e5 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    641a44c View commit details
    Browse the repository at this point in the history
  14. fixed bug

    jerrelllzw committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    b63f117 View commit details
    Browse the repository at this point in the history
  15. Merge pull request #70 from jerrelllzw/Docs

    fixed bug
    jerrelllzw authored Oct 27, 2021
    Configuration menu
    Copy the full SHA
    25c86e2 View commit details
    Browse the repository at this point in the history
  16. Add more logs

    kairoskoh committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    8f794e9 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #71 from kairoskoh/branch-week11-kairos

    Branch week11 kairos
    kairoskoh authored Oct 27, 2021
    Configuration menu
    Copy the full SHA
    0f41693 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2021

  1. 31/10

    Cesare4869 committed Oct 31, 2021
    Configuration menu
    Copy the full SHA
    9c1916f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ccbadbc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    467ad00 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #118 from Cesare4869/master

    add fiannce part in DG and edit the storage part
    Cesare4869 authored Oct 31, 2021
    Configuration menu
    Copy the full SHA
    fd6fa51 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2021

  1. add diagrams folder

    Cesare4869 committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    12ceacc View commit details
    Browse the repository at this point in the history
  2. Merge pull request #119 from Cesare4869/master

    add diagrams folder
    Cesare4869 authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    d3eb87e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a7e2ce1 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #120 from Cesare4869/master

    edit ug-addfinance and change the finance date type to LocalDate also…
    Cesare4869 authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    ddfd838 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2021

  1. Configuration menu
    Copy the full SHA
    0983c25 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7758c55 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #121 from jerrelllzw/Bugs

    fixed bugs according to ped comments for dish classes
    jerrelllzw authored Nov 5, 2021
    Configuration menu
    Copy the full SHA
    58b9f12 View commit details
    Browse the repository at this point in the history
  4. -added decimal formatting for dish prices

    -edited discount-dish messages
    -updated user guide accordingly
    jerrelllzw committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    0b9af21 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #122 from jerrelllzw/Bugs

    edited code based on ped comments
    jerrelllzw authored Nov 5, 2021
    Configuration menu
    Copy the full SHA
    ae9c74f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8597568 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #123 from jerrelllzw/Bugs

    added javadoc comments for dish related classes
    jerrelllzw authored Nov 5, 2021
    Configuration menu
    Copy the full SHA
    97fec27 View commit details
    Browse the repository at this point in the history
  8. -added team picture folder

    -edited about us doc
    -added contents indexing for developer guide
    -added explanations for dish related classes in developer guide
    jerrelllzw committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    1884419 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #124 from jerrelllzw/Bugs

    edited developer guide
    jerrelllzw authored Nov 5, 2021
    Configuration menu
    Copy the full SHA
    d352837 View commit details
    Browse the repository at this point in the history
  10. -added info into team docs

    -added diagrams for dish component and add dish
    jerrelllzw committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    6776f42 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #125 from jerrelllzw/Bugs

    -added info into team docs
    jerrelllzw authored Nov 5, 2021
    Configuration menu
    Copy the full SHA
    ec88fbd View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2021

  1. Removed data from Duke.txt

    kairoskoh committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    5a05dad View commit details
    Browse the repository at this point in the history
  2. Add authorship comments

    kairoskoh committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    a28d481 View commit details
    Browse the repository at this point in the history
  3. added dish diagrams

    jerrelllzw committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    b1e80eb View commit details
    Browse the repository at this point in the history
  4. Added PPP

    kairoskoh committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    4799f86 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #127 from kairoskoh/master

    Add PPP
    kairoskoh authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    bb439b1 View commit details
    Browse the repository at this point in the history
  6. Add javadoc

    kairoskoh committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    eab2ca1 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #128 from kairoskoh/master

    Add javadoc
    kairoskoh authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    d67ab16 View commit details
    Browse the repository at this point in the history
  8. Fixes #78

    kairoskoh committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    6e56f23 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fae434a View commit details
    Browse the repository at this point in the history
  10. Fixes #79

    kairoskoh committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    557ea04 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    62382c8 View commit details
    Browse the repository at this point in the history
  12. Fixes #82

    kairoskoh committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    fdd4aae View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    4a40cde View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4089e9e View commit details
    Browse the repository at this point in the history
  15. Merge pull request #132 from kairoskoh/master

    Add minor changes to user guide
    kairoskoh authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    ec2c326 View commit details
    Browse the repository at this point in the history
  16. Added JUnit Tests

    leecheokfeng committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    cd417e9 View commit details
    Browse the repository at this point in the history
  17. Update UG description based on PE-D

    Fixes #117
    leecheokfeng committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    4f0220e View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    dfc6f28 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    192584b View commit details
    Browse the repository at this point in the history
  20. Merge pull request #133 from Cesare4869/master

    add PPP and change code in finance and DG
    Cesare4869 authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    4c4f253 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    45bb661 View commit details
    Browse the repository at this point in the history
  22. -PPP for jerrell

    jerrelllzw committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    646502c View commit details
    Browse the repository at this point in the history
  23. Merge pull request #134 from jerrelllzw/Bugs

    PPP - jerrell
    jerrelllzw authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    a8a3ae6 View commit details
    Browse the repository at this point in the history
  24. Update UserGuide.md

    jerrelllzw authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    bdf4f73 View commit details
    Browse the repository at this point in the history
  25. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-T12-4/tp

    …into branch-week12-ingredient
    leecheokfeng committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    e0909f6 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    e73c6a7 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    1c3ed95 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    ee7fb33 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    dca69c9 View commit details
    Browse the repository at this point in the history
  30. Merge pull request #135 from Cesare4869/master

    change portfilo and add test and javadoc for finance
    Cesare4869 authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    e344e4f View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    3303a82 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    40976f3 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    b76d8fa View commit details
    Browse the repository at this point in the history
  34. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-T12-4/tp

    …into branch-week12-ingredient
    
    # Conflicts:
    #	docs/AboutUs.md
    leecheokfeng committed Nov 6, 2021
    Configuration menu
    Copy the full SHA
    aaa0524 View commit details
    Browse the repository at this point in the history
  35. Merge pull request #136 from leecheokfeng/branch-week12-ingredient

    Branch ingredient exceptions, UG, PPP
    leecheokfeng authored Nov 6, 2021
    Configuration menu
    Copy the full SHA
    2dd5677 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2021

  1. Configuration menu
    Copy the full SHA
    58b548a View commit details
    Browse the repository at this point in the history
  2. Add details in about us

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    548952f View commit details
    Browse the repository at this point in the history
  3. Add changes to user guide

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    985658c View commit details
    Browse the repository at this point in the history
  4. Add help command

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    9e1c9a3 View commit details
    Browse the repository at this point in the history
  5. Add help to user guide

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    0f7ac20 View commit details
    Browse the repository at this point in the history
  6. edited documentation

    jerrelllzw committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    d1764a4 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #137 from jerrelllzw/final

    edited documentation
    jerrelllzw authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    081a8ee View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a61eddf View commit details
    Browse the repository at this point in the history
  9. Merge pull request #138 from kairoskoh/branch-week12-kairos

    Add help command and checkstyle fixes
    kairoskoh authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    91de64c View commit details
    Browse the repository at this point in the history
  10. Add changes to i/o tests

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    caadb93 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    5ee1e1a View commit details
    Browse the repository at this point in the history
  12. Add i/o tests to gitignore

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    8837d0a View commit details
    Browse the repository at this point in the history
  13. Remove text-ui-test

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    d8bd525 View commit details
    Browse the repository at this point in the history
  14. Revert "Remove text-ui-test"

    This reverts commit d8bd525.
    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    12dd2fa View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    7509c6b View commit details
    Browse the repository at this point in the history
  16. Merge pull request #143 from kairoskoh/branch-week12-kairos

    Remove contents in text-ui-test
    kairoskoh authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    53d5ec1 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    aec77c3 View commit details
    Browse the repository at this point in the history
  18. Merge branch 'master' of https://github.com/AY2122S1-CS2113T-T12-4/tp

    …into branch-week12-ingredient
    leecheokfeng committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    7f7525f View commit details
    Browse the repository at this point in the history
  19. Merge pull request #144 from leecheokfeng/branch-week12-ingredient

    Add Javadoc for ingredient
    leecheokfeng authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    dde8e5c View commit details
    Browse the repository at this point in the history
  20. Add employee class diagram

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    f8e38e6 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    a894e02 View commit details
    Browse the repository at this point in the history
  22. Merge pull request #145 from leecheokfeng/branch-week12-ingredient

    Add diagrams to DG for ingredient
    leecheokfeng authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    eeef729 View commit details
    Browse the repository at this point in the history
  23. Merge pull request #146 from kairoskoh/branch-week12-dg

    Add employee class diagram
    kairoskoh authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    1744901 View commit details
    Browse the repository at this point in the history
  24. Add changes to README.md

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    c39908d View commit details
    Browse the repository at this point in the history
  25. Update jerrelllzw.md

    jerrelllzw authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    617b147 View commit details
    Browse the repository at this point in the history
  26. Merge pull request #147 from kairoskoh/branch-week12-dg

    Add changes to README.md
    kairoskoh authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    5086ccf View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    e5a993c View commit details
    Browse the repository at this point in the history
  28. Merge pull request #148 from leecheokfeng/branch-week12-ingredient

    Update ingredient commands in command summary and help
    leecheokfeng authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    6d1a664 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    83ae2b7 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    f596438 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    c045b85 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    c3e7839 View commit details
    Browse the repository at this point in the history
  33. Merge pull request #150 from Cesare4869/master

    Change the diagrams for finance
    Cesare4869 authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    efa896f View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    e80c7ee View commit details
    Browse the repository at this point in the history
  35. Merge pull request #151 from Cesare4869/master

    correct small issue in show-finance
    Cesare4869 authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    e683d74 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    b7982cc View commit details
    Browse the repository at this point in the history
  37. Merge pull request #152 from kairoskoh/branch-week12-dg

    Add sequence diagram to developer guide
    kairoskoh authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    40c367d View commit details
    Browse the repository at this point in the history
  38. Fix checkstyle errors

    kairoskoh committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    7460668 View commit details
    Browse the repository at this point in the history
  39. Merge pull request #153 from kairoskoh/branch-week12-dg

    Fix checkstyle errors
    kairoskoh authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    3020e5e View commit details
    Browse the repository at this point in the history