[CS2103-W17-4] iScam#34

Open

Tomashiwa wants to merge 644 commits into

nus-cs2103-AY2021S2:masterfrom

AY2021S2-CS2103-W17-4:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Apr 5, 2021

Commits on Apr 6, 2021

Commits on Apr 7, 2021

Add CompletionStatus for Model UML diagram
Tomashiwa
committed
Modify InsurancePlan class to allow client to have multiple Insurance Plans
Juzzanoob
committed
Merge branch 'master' of https://github.com/AY2021S2-CS2103-W17-4/tp into InsurancePlan-Modification
Juzzanoob
committed
Remove trailing whitespaces from UserGuide.md, jodylorah.md and JsonAdaptedClient.java for checkstyle
Juzzanoob
committed
Add fullstop after "i.e" on line 247 of UserGuide.md
Juzzanoob
committed
Merge branch 'master' of https://github.com/AY2021S2-CS2103-W17-4/tp into Correct-English-Errors
Juzzanoob
committed
Add test for EditMeetingCommandTest
frisciliasultan
committed
Deconflict setClientMode and setMeetingMode in Model
frisciliasultan
committed
Restructure the implementation section of DG / Wrote Meeting features
Tomashiwa
committed
Add AddMeetingCommand activity diagram
Tomashiwa
committed
Add EditMeetingCommand activity diagram
Tomashiwa
committed
Push partial FindMeetingActivityDiagram
Tomashiwa
committed
Complete findMeetingCommand activity diagram / Correct other activity diagram
Tomashiwa
committed
Correct grammatical mistakes in UserGuide.md
Juzzanoob
committed
Add addMeetingSequenceDiagram to DG
Tomashiwa
committed
Add editMeetingCommand sequence diagram / Corrected addMeetingCommand sequence diagram arrows
Tomashiwa
committed
Add findMeetingCommand sequence diagram / Add termination in other sequence diagram
Tomashiwa
committed
Correct DeleteSequenceDiagram to be no more addressbook
Tomashiwa
committed
Merge pull request #216 from Tomashiwa/documentation
zaiahkoh
authored
Add output examples for some example commands in UserGuide.md
Juzzanoob
committed
Fix the findmeet bug when using complete and incomplete with other keywords
Tomashiwa
committed
Merge remote-tracking branch 'juzzanoob/InsurancePlan-Modification' into shaun-insurance-list
zaiahkoh
committed
Merge pull request #219 from Tomashiwa/debug-218
JodyLorah
authored
Add FindMeetingsCommandTest
frisciliasultan
committed
Add ListMeetingsCommandTest
frisciliasultan
committed
Add DoneMeetingCommandTest
frisciliasultan
committed
Created a list to show the plans associated with a client in ClientDetailFragment
zaiahkoh
committed
Changed color of bottom border of plans to red
zaiahkoh
committed
Edited imports and comments to conform to checkstyle
zaiahkoh
committed
Modified tests so that tests will at least compile
zaiahkoh
committed
Add RelocateMeetingCommandTest and add equals, getter and setter in RelocateMeetingCommand
frisciliasultan
committed
Add RescheduleMeetingCommandTest
frisciliasultan
committed
Updated tests to match new InsurancePlan structure
zaiahkoh
committed
Removed debugging statement and edited tests to conform to checkstyle
zaiahkoh
committed
Merge remote-tracking branch 'upstream/master' into shaun-insurance-list
zaiahkoh
committed
Added labels and separator for ClientDetailFragment.fxml
zaiahkoh
committed
Added text wrapping for CommandResult display
zaiahkoh
committed
Merge pull request #220 from Zaiah0505/shaun-insurance-list
Juzzanoob
authored
Merge branch 'master' of https://github.com/AY2021S2-CS2103-W17-4/tp into Correct-English-Errors
Juzzanoob
committed
Merge branch 'master' into ui-enhancements
zaiahkoh
committed
Merge pull request #217 from Juzzanoob/Correct-English-Errors
zaiahkoh
authored

Commits on Apr 8, 2021

Commits on Apr 9, 2021

Commits on Apr 10, 2021

Commits on Apr 11, 2021

Commits on Apr 12, 2021