Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CS2113-T11-3] Florizz #29

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

[CS2113-T11-3] Florizz #29

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

Commits on Mar 29, 2024

  1. no message

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    fee78ea View commit details
    Browse the repository at this point in the history

  2. found out DBMS is not allowed for tp. Moved code to unused

    @IanFH
    IanFH committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    5d5f2eb View commit details
    Browse the repository at this point in the history

  3. no message

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    a3be983 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into fuzzy-logic

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    aeb552d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #71 from JeffinsonDarmawan/fuzzy-logic 

    Fuzzy logic
    @IanFH
    IanFH committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    efb2b23 View commit details
    Browse the repository at this point in the history

  6. Made storage puml

    @IanFH
    IanFH committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    18235e4 View commit details
    Browse the repository at this point in the history

  7. Modified Developer Guide Appendix

    @IanFH
    IanFH committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    8581d68 View commit details
    Browse the repository at this point in the history

  8. Add style file for UML

    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9d5a550 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #73 from Ijaaz01/MohamedIjaaz-UML 

    Add style file for UML
    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    7c4f6fc View commit details
    Browse the repository at this point in the history

  10. Merge pull request #72 from IanFH/ian-developer-guide 

    Ian developer guide
    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    8e35626 View commit details
    Browse the repository at this point in the history

  11. Solve IO redirection test

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9fc1248 View commit details
    Browse the repository at this point in the history

  12. Fix text ui testing

    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    6e1c302 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #75 from Ijaaz01/MohamedIjaaz-UML 

    Fix text ui testing
    @IanFH
    IanFH committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    cfbdff5 View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	FlorizzLogger.xml
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    847e593 View commit details
    Browse the repository at this point in the history

  15. no message

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    936d400 View commit details
    Browse the repository at this point in the history

  16. UML-Diagrams

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    3189fde View commit details
    Browse the repository at this point in the history

  17. Edit Fuzzy Logic

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    8ef4179 View commit details
    Browse the repository at this point in the history

  18. input expected

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    6c5fa7c View commit details
    Browse the repository at this point in the history

  19. input expected

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    52d826a View commit details
    Browse the repository at this point in the history

  20. expected

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    49a3ed9 View commit details
    Browse the repository at this point in the history

  21. input expected

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    28bbf24 View commit details
    Browse the repository at this point in the history

  22. Merge remote-tracking branch 'upstream/JeffinsonDarmawan-patch-1' int… 

    …o SamuelUML

# Conflicts:
#	src/main/java/florizz/core/Parser.java
    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    51f8a3d View commit details
    Browse the repository at this point in the history

  23. expected

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    a369d85 View commit details
    Browse the repository at this point in the history

  24. input expected

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    e97ddf4 View commit details
    Browse the repository at this point in the history

  25. Added Info Command Developer Guide and UML Diagram

    @IanFH
    IanFH committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9ddbde1 View commit details
    Browse the repository at this point in the history

  26. Fix test

    @IanFH
    IanFH committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9efb1c8 View commit details
    Browse the repository at this point in the history

  27. Rectified Ui UML

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    699c9c0 View commit details
    Browse the repository at this point in the history

  28. no message

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    3357206 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #78 from IanFH/ian-developer-guide-2 

    Added Info Command Developer Guide and UML Diagram
    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    ddf9253 View commit details
    Browse the repository at this point in the history

  30. Added Samuel's portion of DG

    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d7ac4aa View commit details
    Browse the repository at this point in the history

  31. Merge branch 'master' into Jeffinson-UML

    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    122ba84 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #76 from JeffinsonDarmawan/Jeffinson-UML 

    RemoveFlowerCommand, HelpCommand, ListOccasionCommand UML
    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    45d4501 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'master' into SamuelUML

    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    a839c58 View commit details
    Browse the repository at this point in the history

  34. Developer Guide and UML Diagram

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    34679b0 View commit details
    Browse the repository at this point in the history

  35. Add develoepr guide for add flower command

    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    8022308 View commit details
    Browse the repository at this point in the history

  36. fixed checkstylemain

    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    5d0e16d View commit details
    Browse the repository at this point in the history

  37. Merge branch 'SamuelUML' of https://github.com/samuelory/tp into Samu… 

    …elUML
    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    033f315 View commit details
    Browse the repository at this point in the history

  38. Fixed IO redirection

    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    8edb617 View commit details
    Browse the repository at this point in the history

  39. Merge pull request #79 from samuelory/SamuelUML 

    Samuel uml
    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    a0c1005 View commit details
    Browse the repository at this point in the history

  40. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-3/tp … 

    …into MohamedIjaaz-DG
    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9fd0204 View commit details
    Browse the repository at this point in the history

  41. Fix io test issue

    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    b61fd24 View commit details
    Browse the repository at this point in the history

  42. Merge pull request #80 from Ijaaz01/MohamedIjaaz-DG 

    Add developer guide for add flower command
    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    db806d4 View commit details
    Browse the repository at this point in the history

  43. Fix bug with file path for some photos

    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    a2e490b View commit details
    Browse the repository at this point in the history

  44. Merge pull request #81 from Ijaaz01/MohamedIjaaz-DG 

    Fix bug with file path for some photos
    @Ijaaz01
    Ijaaz01 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    1d35566 View commit details
    Browse the repository at this point in the history

  45. UML

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    c1105a8 View commit details
    Browse the repository at this point in the history

  46. Delete log

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f24a493 View commit details
    Browse the repository at this point in the history

  47. Modified DG

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d9bff58 View commit details
    Browse the repository at this point in the history

  48. Merge branch 'Jeffinson-UML' of https://github.com/JeffinsonDarmawan/tp… 

    … into Jeffinson-UML

# Conflicts:
#	text-ui-test/EXPECTED.TXT
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    e0596dc View commit details
    Browse the repository at this point in the history

  49. Developer Guide

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d3de93b View commit details
    Browse the repository at this point in the history

  50. Merge branch 'master' into Jeffinson-UML

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    e69bd2f View commit details
    Browse the repository at this point in the history

  51. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-3/tp … 

    …into fuzzy-logic

# Conflicts:
#	FlorizzLogger.xml
#	src/main/java/florizz/core/Parser.java
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f1f6f24 View commit details
    Browse the repository at this point in the history

  52. Merge pull request #82 from JeffinsonDarmawan/Jeffinson-UML 

    DG2
    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f8dca7e View commit details
    Browse the repository at this point in the history

  53. Merge pull request #83 from JeffinsonDarmawan/fuzzy-logic 

    Fuzzy logic
    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    16d6f14 View commit details
    Browse the repository at this point in the history

  54. Add more valid items to Fuzzy Logic

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    96dd298 View commit details
    Browse the repository at this point in the history

  55. Merge pull request #84 from JeffinsonDarmawan/Fuzzy-Logic-2 

    Add more valid items to Fuzzy Logic
    @samuelory
    samuelory committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9d992aa View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. Add Damerau-Levenshtein distance and fixed a bug on parser

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    6e74721 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Fixed minor bug

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

Commits on Apr 2, 2024

  1. Merge pull request #87 from JeffinsonDarmawan/Fuzzy-Logic-2 

    Add Damerau-Levenshtein distance and fixed a bug on parser
    @Ijaaz01
    Ijaaz01 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    5dd5baf View commit details
    Browse the repository at this point in the history

  2. Fix a bug on parser

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    3b41c21 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #88 from JeffinsonDarmawan/bug-fix-1 

    Fix a bug on parser
    @samuelory
    samuelory committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    a426e28 View commit details
    Browse the repository at this point in the history

  4. Abstracted flower info to have a filter method in FlowerDictionary an… 

    …d print method in Ui
    @samuelory
    samuelory committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    c7e6452 View commit details
    Browse the repository at this point in the history

  5. fixed typo in flower does not exist exception

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

  6. Added Dark Crimson Rose to test info command

    @samuelory
    samuelory committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    1df428d View commit details
    Browse the repository at this point in the history

  7. Updated formatting of info command

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

  8. fixed checkstylemain

    @samuelory
    samuelory committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    5203d5d View commit details
    Browse the repository at this point in the history

  9. Add storage class

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

  10. Merge pull request #89 from samuelory/Samuel-V2.1 

    Refactored and updated Info Command to support flowers with different meanings for different colours
    @Ijaaz01
    Ijaaz01 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ae9d470 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #90 from Ijaaz01/MohamedIjaaz-Storage 

    Add storage class
    @IanFH
    IanFH committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    a71ce66 View commit details
    Browse the repository at this point in the history

  12. Amended Ijaaz to be authoer of printflowerinfo

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

Commits on Apr 3, 2024

  1. Added separate pages for flowers and flower info

    @samuelory
    samuelory committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    31d4e70 View commit details
    Browse the repository at this point in the history

  2. Increased page size to 5

    @samuelory
    samuelory committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    56ab34c View commit details
    Browse the repository at this point in the history

  3. Decreased similarity threshold for FuzzyLogic

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

  4. Add functionality to recover saved bouquets

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

  5. Merge pull request #93 from samuelory/Samuel-V2.1 

    Added separate pages for flowers
    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    c062a9a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #92 from IanFH/database-1 

    [Unused Code] Database 1
    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3763d69 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into MohamedIjaaz-Storage

    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    86bc983 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #94 from Ijaaz01/MohamedIjaaz-Storage 

    Add functionality to recover saved bouquets
    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3e9961c View commit details
    Browse the repository at this point in the history

  9. Fixed SEVERE logger

    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    270117b View commit details
    Browse the repository at this point in the history

  10. Add save command

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

  11. Fix io test expected output

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

  12. Update gitignore

    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    82355d8 View commit details
    Browse the repository at this point in the history

  13. Update userguide

    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    4cf7eb7 View commit details
    Browse the repository at this point in the history

  14. Add javadoc for printsavesuccess function

    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9661be0 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #95 from Ijaaz01/MohamedIjaaz-Save 

    Add save command
    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3defca4 View commit details
    Browse the repository at this point in the history

  16. no message

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    7a73fe7 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-3/tp

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

  18. Implemented recommend flowers command, without filler flowers

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

  19. Removed duplicate colours for recommend command. Updated UG for recom… 

    …mend. Found bugs for flower price
    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    7abddb2 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' into bouquet-recommendation

    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    294383a View commit details
    Browse the repository at this point in the history

  21. Update Ui.java 

    Missing closing bracket when solving merge conflict
    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    2c227e3 View commit details
    Browse the repository at this point in the history

  22. Fix merging syntax issues

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

  23. Fixed checkstyle

    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    4dc8165 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #97 from IanFH/bouquet-recommendation 

    Bouquet recommendation
    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d06c37c View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-3/tp

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

  26. Updated flowers and info command in UserGuide.md

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

  27. Update user guide

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

  28. Merge pull request #99 from AY2324S2-CS2113-T11-3/Samuel-V2.2 

    Updated flowers and info command in UserGuide.md
    @samuelory
    samuelory committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    e6bab99 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #100 from Ijaaz01/MohamedIjaaz-UG 

    Update user guide
    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    ddb7275 View commit details
    Browse the repository at this point in the history

  30. Fix format for command titles

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

  31. Merge branch 'master' into MohamedIjaaz-UG

    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    2eb4552 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #101 from Ijaaz01/MohamedIjaaz-UG 

    Fix format for command titles
    @samuelory
    samuelory committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    2b3dccb View commit details
    Browse the repository at this point in the history

  33. Fixed unhandled exception in add and remove

    @samuelory
    samuelory committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3198abe View commit details
    Browse the repository at this point in the history

  34. Touch up

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

  35. Merge pull request #105 from samuelory/Samuel-V2.2 

    Fixed unhandled exception in add and remove
    @samuelory
    samuelory committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9119497 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #104 from IanFH/touch-up-ms2 

    Touch up
    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    55157b0 View commit details
    Browse the repository at this point in the history

  37. User Guide

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

  38. Testing page breaks for user guide

    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    7410a08 View commit details
    Browse the repository at this point in the history

  39. Merge pull request #107 from AY2324S2-CS2113-T11-3/Ijaaz01-pageBreak 

    Testing page breaks for user guide
    @Ijaaz01
    Ijaaz01 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    f19cd55 View commit details
    Browse the repository at this point in the history

  40. Merge branch 'master' into userguide

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    590877f View commit details
    Browse the repository at this point in the history

  41. Merge pull request #106 from JeffinsonDarmawan/userguide 

    Update userguide for fuzzy logic
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    6a497bb View commit details
    Browse the repository at this point in the history

  42. iotest

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    522140f View commit details
    Browse the repository at this point in the history

  43. fix expected.txt

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    182f21e View commit details
    Browse the repository at this point in the history

  44. fix expected.txt

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

  45. fix actual and expected

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

  46. fix fullstop

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    52c6b48 View commit details
    Browse the repository at this point in the history

  47. Merge pull request #108 from JeffinsonDarmawan/iotest 

    iotest
    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    efed9d0 View commit details
    Browse the repository at this point in the history

  48. Fixed 0x Flower

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    8b0447c View commit details
    Browse the repository at this point in the history

  49. Fixed 0x flower

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

  50. Merge pull request #110 from JeffinsonDarmawan/Fix-bug-0quantityFlower 

    Fix bug 0x quantity flower
    @IanFH
    IanFH committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    affab09 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Changed Ui

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    4cd873a View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. Fix Review PE-D

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    844c0a4 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Fix Review

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    09aaf7b View commit details
    Browse the repository at this point in the history

  2. Bye Ui

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    2dcc86d View commit details
    Browse the repository at this point in the history

  3. Change recommendCommand to no longer kick out user if bad input is given

    @Ijaaz01
    Ijaaz01 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    89d6e6f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #113 from JeffinsonDarmawan/bug-fix 

    Changed Ui for recommend to remove redundancy and grammar errors
    @samuelory
    samuelory committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    cf5874e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #153 from JeffinsonDarmawan/Fix-Review-1 

    PE-D review fixing
    @samuelory
    samuelory committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    487447e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #154 from Ijaaz01/MohamedIjaaz-recommend 

    Change recommendCommand to no longer kick out user if bad input is given
    @samuelory
    samuelory committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    fe1c5fd View commit details
    Browse the repository at this point in the history

  7. Fixed exceptions for backpage and removed trimmedInput from commandHa… 

    …ndler because input is trimmed from the start
    @samuelory
    samuelory committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    3cbfbc3 View commit details
    Browse the repository at this point in the history

  8. Added colour option to add command

    @samuelory
    samuelory committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    1172e82 View commit details
    Browse the repository at this point in the history

  9. Fuzzy Logic Improvement

    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    1566961 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Add cancel option to exit recommend

    @Ijaaz01
    Ijaaz01 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    66c278c View commit details
    Browse the repository at this point in the history

  2. Re-add assertion

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

  3. Added colour option to remove command

    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    15198b0 View commit details
    Browse the repository at this point in the history

  4. Uncomment code in parser

    @Ijaaz01
    Ijaaz01 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    0afbf63 View commit details
    Browse the repository at this point in the history

  5. Fix bug related to info command not working properly

    @Ijaaz01
    Ijaaz01 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4fe40a2 View commit details
    Browse the repository at this point in the history

  6. attempt to fix io redirection

    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    06de178 View commit details
    Browse the repository at this point in the history

  7. reverted io test to help and bye

    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8e781b5 View commit details
    Browse the repository at this point in the history

  8. added new bouquet to io test

    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    02b58c6 View commit details
    Browse the repository at this point in the history

  9. added adding flower to io test

    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    00e0407 View commit details
    Browse the repository at this point in the history

  10. added adding flower part 2 to io test

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

  11. added removing flowers to io test

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

  12. Merge pull request #156 from samuelory/Samuel-V2.3 

    Adding Colour Selection to add and remove flowers
    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cf19688 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #155 from Ijaaz01/MohamedIjaaz-recommend 

    Mohamed ijaaz recommend
    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    930b2ab View commit details
    Browse the repository at this point in the history

  14. Merge pull request #157 from Ijaaz01/MohamedIjaaz-infoFix 

    Fix bug related to info command not working properly
    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    687224f View commit details
    Browse the repository at this point in the history

  15. Made showing flowers clearer so users wont input colour + name and ex… 

    …pect an output for info
    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b224e0f View commit details
    Browse the repository at this point in the history

  16. Fixed IO redirection test

    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    56a762b View commit details
    Browse the repository at this point in the history

  17. caught numberFormatException

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

  18. reverted io test back to help and bye

    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    38b88b0 View commit details
    Browse the repository at this point in the history

  19. redid io test to test more conditions

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

  20. reduced io testing

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

  21. Merge pull request #158 from samuelory/Samuel-V2.4 

    Fixed PE-D bugs
    @Ijaaz01
    Ijaaz01 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    2b3bd20 View commit details
    Browse the repository at this point in the history

  22. Added Samuel PPP

    @samuelory
    samuelory committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7c504d9 View commit details
    Browse the repository at this point in the history

  23. fuzzy logic enhancement

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

Commits on Apr 10, 2024

  1. Added flowers to flowerDictionary and fixed filler info bug

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

  2. Fixed add and remove command to accept flower names with a space inside

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

  3. Made calculating levenshtein distance not care about case

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

  4. Adjusted flowername to be printed in addflowersuccess and removeflowe… 

    …rsuccess
    @samuelory
    samuelory committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    5f700a9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #159 from samuelory/Samuel-V2.4 

    Added Samuel PPP and fixed various bugs
    @samuelory
    samuelory committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    3509042 View commit details
    Browse the repository at this point in the history

  6. Mild adjustment to DG

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

  7. Merge pull request #161 from samuelory/Samuel-V2.4 

    Mild adjustment to DG
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    c9cd9d1 View commit details
    Browse the repository at this point in the history

  8. Improvements on Fuzzy Logic

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

  9. Merge branch 'master' into fuzzylogic-enhancement

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

  10. io redirection

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

  11. Merging Conflict

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

  12. Debug

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

  13. Merge pull request #1 from JeffinsonDarmawan/fuzzylogic-enhancement 

    Fuzzylogic enhancement
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    d81b239 View commit details
    Browse the repository at this point in the history

  14. Merging Conflict

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

  15. Merge branch 'master' into fuzzylogic-enhancement

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

  16. Update ppp

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

  17. Merge pull request #162 from JeffinsonDarmawan/fuzzylogic-enhancement 

    Fuzzy Logic enhancement
    @Ijaaz01
    Ijaaz01 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    4d3c12b View commit details
    Browse the repository at this point in the history

  18. Merge pull request #164 from Ijaaz01/MohamedIjaaz-PPP 

    Update ppp
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    54b5937 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Renamed PPP drafts

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

  2. Rename JeffinsonDawarman.md to JeffinsonDarmawan.md

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

  3. PE-D bug fixes

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

  4. Merge pull request #165 from samuelory/Samuel-V2.5 

    Renamed PPP drafts
    @Ijaaz01
    Ijaaz01 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    8ea63ca View commit details
    Browse the repository at this point in the history

  5. Merge pull request #166 from JeffinsonDarmawan/PE-D-bug-fix 

    PE-D bug fixes
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3ba51d6 View commit details
    Browse the repository at this point in the history

  6. PPP

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

  7. Updated UML diagram based on TA suggestion for add flower and info co… 

    …mmand
    @IanFH
    IanFH committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a5613a7 View commit details
    Browse the repository at this point in the history

  8. More PPP

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

  9. Type help, to view a list of valid commands!

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

  10. io redirection

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

  11. Merge pull request #168 from JeffinsonDarmawan/Jeff-PPP 

    Jeffinson's PPP
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e2fd3de View commit details
    Browse the repository at this point in the history

  12. draft for ppp

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

  13. Merge pull request #169 from IanFH/bug-fixes 

    Bug fixes
    @IanFH
    IanFH committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    c17090b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Small Edit on PPP

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

  2. Update aboutus.md file with proper portfolio paths

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

  3. JUnit Tests

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

  4. Compute DL Distance Test

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

  5. Rename ppp to lower case

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

  6. Merge pull request #170 from Ijaaz01/MohmamedIjaaz-PPPupdate 

    Update aboutus.md file with proper portfolio paths
    @IanFH
    IanFH committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    9120a94 View commit details
    Browse the repository at this point in the history

  7. JUnit Test

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

  8. Additional Java Doc Comments

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

  9. Delete NextCommandJava

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

  10. Update PPP

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

  11. PPP

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

  12. LowerCase md files

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

  13. Merge branch 'master' into Test-Code

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

  14. Update Bouquet.java

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

Commits on Apr 14, 2024

  1. Merge pull request #171 from JeffinsonDarmawan/Test-Code 

    JUnit Test Code
    @Ijaaz01
    Ijaaz01 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    a350bac View commit details
    Browse the repository at this point in the history

  2. Implemented size selection for recommend command

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

  3. Caught NoSuchElementException and IllegalStateException

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

  4. Merge pull request #172 from samuelory/Samuel-v2.6 

    Caught NoSuchElementException and IllegalStateException
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    37be645 View commit details
    Browse the repository at this point in the history

  5. build gradle

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

  6. Add test code for FlowerDictionary

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

  7. Ascii Table

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

  8. Compare Feature

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

  9. ASCII Table & User Guide Update & PPP Update

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

  10. Compare Command Test

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

  11. IO Redirection

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

  12. IO Redirection

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

  13. IO Redirection 3

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

Commits on Apr 15, 2024

  1. Exception for incorrect formatting and modification to toString() met… 

    …hod in flower
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    6a7deff View commit details
    Browse the repository at this point in the history

  2. Added tests for RecommendCommand and Bouquet. Added `totalNumberO… 

    …fFlowers()` method which counts how many flowers in bouquet
    @IanFH
    IanFH committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    928220a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #173 from JeffinsonDarmawan/table-format 

    Table format
    @samuelory
    samuelory committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    f21a2a0 View commit details
    Browse the repository at this point in the history

  4. Modified ui breakpoint to make it nicer

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

  5. Adjusted max width of help table and updated userguide expected outputs

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

  6. checkstylemain

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

  7. Fixed bug on recommendCommand class askOccasion method. Removed F… 

    …uzzy Logic as it was not in the correct place and caused while loop to terminate early
    @IanFH
    IanFH committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    2dc6a5f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into bug-fixes-2

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

  9. Update Flower.java 

    Removed `getType` duplicate
    @IanFH
    IanFH committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    b15cda8 View commit details
    Browse the repository at this point in the history

  10. Fixed checkStyle

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

  11. Merge pull request #174 from samuelory/Samuel-V2.7 

    Adjusted max width of help table and updated userguide expected outputs
    @samuelory
    samuelory committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    f859bbc View commit details
    Browse the repository at this point in the history

  12. Merge pull request #175 from IanFH/bug-fixes-2 

    Bug fixes 2
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    eb9e5bb View commit details
    Browse the repository at this point in the history

  13. made adding/removing to bouquet non case-sensitive

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

  14. Updated UG

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

  15. Merge pull request #176 from samuelory/samuel-v2.8 

    Added UG changes and bug fix
    @samuelory
    samuelory committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    6573068 View commit details
    Browse the repository at this point in the history

  16. Updated PPP

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

  17. Fixed PPP links

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

  18. Merge pull request #177 from samuelory/samuel-v2.8 

    Updated PPP
    @samuelory
    samuelory committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9c4d2e1 View commit details
    Browse the repository at this point in the history

  19. Created Sequence Diagram for recommendCommand and askOccasion(). … 

    …Updated UG for `recommendCommand`. Added table of contents to UG. Updated PPP
    @IanFH
    IanFH committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    34d3618 View commit details
    Browse the repository at this point in the history

  20. Fixed UG formatting

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

  21. Compare-DG

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

  22. updated ppp

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

  23. Merge pull request #179 from samuelory/samuel-v2.8 

    Fixed UG formatting
    @JeffinsonDarmawan
    JeffinsonDarmawan committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    1b305d2 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #178 from IanFH/docs2 

    Created Sequence Diagram for `recommendCommand` and `askOccasion()`. …
    @samuelory
    samuelory committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    6d59605 View commit details
    Browse the repository at this point in the history

  25. Compare Test

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

  26. Final pr for dg, ug and ppp

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

  27. Merge pull request #180 from JeffinsonDarmawan/Compare-DG 

    Compare-DG
    @samuelory
    samuelory committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    444a5f2 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'master' into MI-final

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

  29. Merge pull request #181 from Ijaaz01/MI-final 

    Final pr for dg, ug and ppp
    @samuelory
    samuelory committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    b7fcf3b View commit details
    Browse the repository at this point in the history

  30. Checkstyle fix

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

  31. Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-3/tp … 

    …into MI-final
    @Ijaaz01
    Ijaaz01 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    105bb30 View commit details
    Browse the repository at this point in the history

  32. updated ppp

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

  33. Merge pull request #182 from Ijaaz01/MI-final 

    Mi final
    @IanFH
    IanFH committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    028c3b4 View commit details
    Browse the repository at this point in the history

  34. checkstyle

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

  35. Merge pull request #183 from IanFH/docs3 

    updated ppp
    @samuelory
    samuelory committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    935f85b View commit details
    Browse the repository at this point in the history

  36. DG

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

  37. Merge pull request #184 from JeffinsonDarmawan/Compare-DG 

    Added Acknowledgement to DG for using third-party library
    @Ijaaz01
    Ijaaz01 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    245eb92 View commit details
    Browse the repository at this point in the history

  38. Acknowledgement

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

  39. Merge pull request #185 from JeffinsonDarmawan/Compare-DG 

    Acknowledgement-2
    @Ijaaz01
    Ijaaz01 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    5c15044 View commit details
    Browse the repository at this point in the history