[CS2103T-W09-4] JABPro#41

Open

sk2001git wants to merge 871 commits intonus-cs2103-AY2324S1:masterfrom AY2324S1-CS2103T-W09-4:master

+24,094-1,837

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

Commits on Nov 12, 2023

Commits on Nov 13, 2023

DG: add use case for tags
AriellaCallista
committed
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Merge branch 'master' into branch-Documentation
AriellaCallista
committed
Fix UG formatting
AriellaCallista
committed
Fix UG formatting
AriellaCallista
committed
Merge pull request #188 from ScarletBlanks/master
AriellaCallista
authored
More fixes to format
AriellaCallista
committed
Merge pull request #190 from AriellaCallista/branch-Documentation
ScarletBlanks
authored
Added an Activity Diagram for the Set Command
ScarletBlanks
committed
Merge remote-tracking branch 'upstream/master'
ScarletBlanks
committed
DG: add manual testing test cases
AriellaCallista
committed
Updated the AboutMe to link to the proper ppp
ScarletBlanks
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Merge branch 'master' into branch-DG
Misra Aditya
committed
Merge pull request #191 from ScarletBlanks/master
sk2001git
authored
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp into branch-UG-final
sk2001git
committed
- Added Activity Diagram for Export
ScarletBlanks
committed
Merge remote-tracking branch 'upstream/master'
ScarletBlanks
committed
Update DG
Misra Aditya
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Merge branch 'master' into branch-DG
Misra Aditya
committed
Update DG
Misra Aditya
committed
Update DG
Misra Aditya
committed
Updated the developer guide for the implementation of Set and Export
ScarletBlanks
committed
Merge pull request #192 from MadLamprey/branch-DG
ScarletBlanks
authored
Final update
Misra Aditya
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Merge branch 'master' into branch-skeletalPPP
Misra Aditya
committed
UG and DG update
sk2001git
committed
Merge pull request #195 from sk2001git/branch-UG-final
AriellaCallista
authored
Merge remote-tracking branch 'upstream/master'
ScarletBlanks
committed
Update UserGuide to align format
ScarletBlanks
committed
Update PPP
Misra Aditya
committed
Update developer guide
ketweeen
committed
Pull from upstream
ketweeen
committed
Update user guide
ketweeen
committed
DG: add activity diagram for search
AriellaCallista
committed
UG: add on to faq
AriellaCallista
committed
Pull from upstream
ketweeen
committed
Update user guide
ketweeen
committed
Merge pull request #197 from ketweeen/branch-UserGuide
AriellaCallista
authored
Pull from upstream
ketweeen
committed
Update user guide
ketweeen
committed
Updated the PPP in alignment with deliverables
ScarletBlanks
committed
Added a new line at EOF to pass gradle
ScarletBlanks
committed
Merge pull request #196 from MadLamprey/branch-skeletalPPP
MadLamprey
authored
Merge pull request #194 from MadLamprey/branch-final
MadLamprey
authored
Update user guide
ketweeen
committed
Pull from upstream
ketweeen
committed
Merge pull request #193 from ScarletBlanks/master
ScarletBlanks
authored
DG: update planned enhancements and appendix
AriellaCallista
committed
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Merge branch 'master' into branch-Documentation
AriellaCallista
committed
Fix checkstyle
AriellaCallista
committed
Merge pull request #198 from AriellaCallista/branch-Documentation
sk2001git
authored
Update DG and UG
sk2001git
committed
Conflict resolve
sk2001git
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Merge branch 'master' into branch-UG
Misra Aditya
committed
UG and DG updates
sk2001git
committed
Update UG
Misra Aditya
committed
Fix DG
sk2001git
committed
Update UG
sk2001git
committed
Update UG and DG
sk2001git
committed
Merge pull request #199 from sk2001git/branch-UG-final
AriellaCallista
authored
Fix Bug, Error message incorrect
sk2001git
committed
Accidentally add DG changes to this branch
sk2001git
committed
Update UG
Misra Aditya
committed
Merge pull request #202 from sk2001git/branch-bug-fix-error-edit
AriellaCallista
authored
Merge branch 'master' into branch-UG
MadLamprey
authored
Style ExportActivityDiagram
AriellaCallista
committed
Minor code quality fixes for delete, find parsers
AriellaCallista
committed
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Merge branch 'master' into branch-Documentation
AriellaCallista
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Merge branch 'master' into branch-DG
Misra Aditya
committed
DG updates and PPP
sk2001git
committed
Update DG
Misra Aditya
committed
Merge branch 'master' into branch-skeletalPPP
Misra Aditya
committed
Update PPP
Misra Aditya
committed
Fix DG visual bugs
sk2001git
committed
Merge pull request #203 from MadLamprey/branch-UG
MadLamprey
authored
Merge pull request #205 from MadLamprey/branch-DG
MadLamprey
authored
Merge pull request #206 from MadLamprey/branch-skeletalPPP
MadLamprey
authored
Merge pull request #204 from sk2001git/branch-update-DG
sk2001git
authored
DG updates for spacing
sk2001git
committed
DG update
sk2001git
committed
Update to UG and DG
sk2001git
committed
DG changes
sk2001git
committed
Merge pull request #207 from sk2001git/branch-update-DG
AriellaCallista
authored
Update PPP
sk2001git
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
UG: add table for errors
AriellaCallista
committed
Merge branch 'AY2324S1-CS2103T-W09-4:master' into master
AriellaCallista
authored
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp into branch-update-DG
sk2001git
committed
Merge branch 'master' into branch-Documentation
AriellaCallista
authored
Merge branch 'master' into branch-DG
Misra Aditya
committed
Update DG
Misra Aditya
committed
Page Break for UG
sk2001git
committed
DG page break
sk2001git
committed
Merge pull request #210 from MadLamprey/branch-DG
MadLamprey
authored
Update formatting
Misra Aditya
committed
Update developer guide
ketweeen
committed
Reupdate sequence diagram for delete
sk2001git
committed
Merge pull request #211 from sk2001git/branch-update-DG
sk2001git
authored
Pull from upstream
ketweeen
committed
UG Line break
sk2001git
committed
Merge pull request #212 from MadLamprey/branch-DG
MadLamprey
authored
Updated the developer guide to repair confusing statements
ScarletBlanks
committed
Merge pull request #213 from sk2001git/branch-update-DG
ScarletBlanks
authored
Merge pull request #214 from ScarletBlanks/master
ScarletBlanks
authored
DG: Add create implementation
AriellaCallista
committed
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Merge branch 'branch-Documentation' of https://github.com/AriellaCallista/tp into branch-Documentation
AriellaCallista
committed
Merge branch 'AY2324S1-CS2103T-W09-4:master' into master
AriellaCallista
authored
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Merge branch 'master' into branch-Documentation
AriellaCallista
committed
UG: fix nits
AriellaCallista
committed
Merge pull request #208 from AriellaCallista/branch-Documentation
AriellaCallista
authored
Update developer guide
ketweeen
committed
Update developer guide
ketweeen
committed
Pull from upstream
ketweeen
committed
Pull from upstream
ketweeen
committed
Bugfix: editing scores
AriellaCallista
committed
Merge pull request #215 from ketweeen/branch-DeveloperGuide
ketweeen
authored
Bugfix: fix bug in editing scores
AriellaCallista
committed
ParseTag: change tagName to trimmedTag
AriellaCallista
committed
Update UG and DG
sk2001git
committed
Merge pull request #216 from AriellaCallista/branch-EnhancedTag-6-categories
AriellaCallista
authored
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Update UG
sk2001git
committed
Merge pull request #217 from MadLamprey/branch-release
AriellaCallista
authored
stash
sk2001git
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
sk2001git
committed
Undo changes
sk2001git
committed
Update merge conflict
sk2001git
committed
UG and DG updates
sk2001git
committed
Bugfix: add and edit using tags that haven't been created
AriellaCallista
committed
Merge pull request #218 from sk2001git/branch-UG-final
AriellaCallista
authored
Bug Fix for assessment tags and UG update
sk2001git
committed
Remove tests
AriellaCallista
committed
Updated UG
sk2001git
committed
Checkstyle
sk2001git
committed
Merge pull request #221 from sk2001git/branch-UG-final
sk2001git
authored
DG: update search sequence diagram
AriellaCallista
committed
UG for filter
sk2001git
committed
Remove JsonAdaptedTag
AriellaCallista
committed
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Merge branch 'master' into branch-Documentation
AriellaCallista
committed
Merge pull request #220 from AriellaCallista/branch-EnhancedTag-6-categories
AriellaCallista
authored
Merge pull request #223 from AriellaCallista/branch-Documentation
AriellaCallista
authored
Merge pull request #222 from sk2001git/branch-UG-final
sk2001git
authored
Fix minor formatting issue
AriellaCallista
committed
Fix nits
AriellaCallista
committed
Enlarge diagrams
AriellaCallista
committed
Merge pull request #224 from AriellaCallista/branch-Documentation
AriellaCallista
authored

Commits on Nov 14, 2023

Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp into branch-release
Misra Aditya
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Merge branch 'master' into branch-UG
Misra Aditya
committed
Update UG
Misra Aditya
committed
Update DG
Misra Aditya
committed
Update comments
Misra Aditya
committed
Update UG
Misra Aditya
committed
Merge pull request #225 from MadLamprey/branch-UG
MadLamprey
authored
DG: formatting fix
AriellaCallista
committed
Fix nits
AriellaCallista
committed
Merge pull request #226 from AriellaCallista/branch-Documentation
MadLamprey
authored
Fix listT create img
AriellaCallista
committed
Update DG
AriellaCallista
committed
Fix activity diagrams
AriellaCallista
committed
Fix activity diagrams
AriellaCallista
committed
Fix checkstyle
AriellaCallista
committed
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Fix bug with defining categories
AriellaCallista
committed
Merge pull request #227 from AriellaCallista/branch-Documentation
MadLamprey
authored
Merge pull request #228 from AriellaCallista/branch-EnhancedTag-6-categories
MadLamprey
authored
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Merge branch 'master' into branch-release
Misra Aditya
committed
Merge pull request #229 from MadLamprey/branch-release
MadLamprey
authored
Update user guide and developer guide
ketweeen
committed
Pull from upstream
ketweeen
committed
Fix checkstyle issue
ketweeen
committed
Merge pull request #230 from ketweeen/branch-DeveloperGuide
ketweeen
authored
Stash changes
sk2001git
committed
Bugfix: edit and add with new tag categories
AriellaCallista
committed
Merge pull request #231 from AriellaCallista/branch-EnhancedTag-6-categories
AriellaCallista
authored
Error fix, UG and DG improvement
sk2001git
committed
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp into branch-UG-final
sk2001git
committed
Checkstyle fix
sk2001git
committed
Merge pull request #233 from sk2001git/branch-UG-final
sk2001git
authored
Merge branch 'master' of https://github.com/AY2324S1-CS2103T-W09-4/tp
Misra Aditya
committed
Merge branch 'master' into branch-release
Misra Aditya
committed
Merge pull request #234 from MadLamprey/branch-release
MadLamprey
authored
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Fix nit
AriellaCallista
committed

Commits on Nov 15, 2023

Update UG for CS2101
AriellaCallista
committed
Merge pull request #235 from AriellaCallista/branch-Documentation
AriellaCallista
authored
Update UI screenshots
ketweeen
committed
Update UG for CS2101 #2
AriellaCallista
committed
Fix checkstyle
AriellaCallista
committed
Merge pull request #236 from AriellaCallista/branch-Documentation
AriellaCallista
authored
Standardize UI screenshots
ketweeen
committed
Pull from upstream
ketweeen
committed
Update UG for CS2101 #3
AriellaCallista
committed
Update UG for CS2101 #4
AriellaCallista
committed
Merge pull request #237 from AriellaCallista/branch-Documentation
ketweeen
authored
Update grammar
ketweeen
committed
Pull from upstream
ketweeen
committed
Merge pull request #238 from ketweeen/branch-FinalUserGuide
ketweeen
authored
Fix bug
ketweeen
committed
Merge pull request #239 from ketweeen/branch-FinalUserGuide
AriellaCallista
authored
Fix bugs
AriellaCallista
committed
Merge branch 'master' of https://github.com/AriellaCallista/tp
AriellaCallista
committed
Merge branch 'master' into branch-Documentation
AriellaCallista
committed
Merge pull request #240 from AriellaCallista/branch-Documentation
AriellaCallista
authored
Fix bug
AriellaCallista
committed
Fix bug
AriellaCallista
committed
Rearrange
AriellaCallista
committed
Merge pull request #241 from AriellaCallista/branch-Documentation
ketweeen
authored
Fix bug
AriellaCallista
committed
Merge pull request #242 from AriellaCallista/branch-Documentation
ketweeen
authored
Fix bug
AriellaCallista
committed
Merge pull request #243 from AriellaCallista/branch-Documentation
ketweeen
authored
Fix bug
AriellaCallista
committed
Merge pull request #244 from AriellaCallista/branch-Documentation
ketweeen
authored

Commits on Jan 16, 2024