-
Notifications
You must be signed in to change notification settings - Fork 248
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
[CS2113-F13-2] BrokeMan #51
Open
namsengi11
wants to merge
418
commits into
nus-cs2113-AY2223S2:master
Choose a base branch
from
AY2223S2-CS2113-F13-2:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
418 commits
Select commit
Hold shift + click to select a range
a382e5e
fixed checkstyle
Samueltansw 5dc939e
Merge pull request #62 from Samueltansw/master
Samueltansw 8799059
Added Save component for Budget and Read Component
SpeciLiam ef38c4a
Added Save component for Budget and Read Component
SpeciLiam 5aec75a
CheckStyle
SpeciLiam 2e2e987
Merge pull request #63 from AY2223S2-CS2113-F13-2/master
SpeciLiam a593cbc
Update the command list of User Guide
3e52928
Update the command cheatsheet of User Guide
cb0f1d4
Update the command cheatsheet of User Guide
6527fac
Update the text ui
329b632
Merge branch 'master' of https://github.com/sistine-yu/tp
0e69216
Merge pull request #65 from sistine-yu/master
sistine-yu e543531
updated UserGuide.md and enabled assertions in build.gradle
Samueltansw fb305b6
added table of contents for user guide
Samueltansw 9ead250
Merge pull request #66 from Samueltansw/master
Samueltansw 1939efa
Developer Guide for Save Methods and Classes.
SpeciLiam 547b447
Merge pull request #67 from AY2223S2-CS2113-F13-2/master
SpeciLiam 95530bf
Update DG miscellaneous
82aac8f
merge the updated upstreamMerge branch 'master' of https://github.com…
b0ce5cf
Add Entry Test
namsengi11 8a8ced2
Resolve checkstyle issue
namsengi11 4f219b7
Resolve checkstyle issue
namsengi11 dece3a3
Resolve checkstyle issue
namsengi11 27515d4
Resolve checkstyle issue
namsengi11 2f06c81
Resolve contrasting save file
namsengi11 6be16a8
Merge pull request #69 from namsengi11/test
namsengi11 6d22cbc
added assertions to parser class and some minor changes to UserInput
Samueltansw a6e0538
Merge remote-tracking branch 'upstream/master' into branch-AddAssertions
Samueltansw d9cdaf0
fixed indentation error
Samueltansw d993104
fixed indentation error
Samueltansw bf7cfdf
Resolve version conflict issue
namsengi11 07e8748
removed wrong assertion in parser class
Samueltansw 7ec9003
updated expected.txt
Samueltansw ef52e74
Merge pull request #70 from Samueltansw/branch-AddAssertions
Samueltansw 2178ee5
updated help message
Samueltansw 9f29430
Merge pull request #71 from Samueltansw/master
Samueltansw 1a928a4
Merge pull request #68 from sistine-yu/master
Samueltansw f74297f
Update UserGuide.md
namsengi11 ed62329
added architecture sequence diagram to developer guide
Samueltansw baa05b2
Merge remote-tracking branch 'upstream/master'
Samueltansw a1ad8f6
Merge pull request #72 from Samueltansw/master
Samueltansw 27b8534
Update UG hyperlink
ef88079
Merge branch 'AY2223S2-CS2113-F13-2:master' into master
sistine-yu 00b6003
Merge pull request #73 from sistine-yu/master
sistine-yu 7bf465b
updated developerGuide.md
Samueltansw 13abc0e
Merge remote-tracking branch 'upstream/master'
Samueltansw 54d8b8e
minor edit tod developer guide
Samueltansw bc44722
Merge pull request #74 from Samueltansw/master
Samueltansw 94255f7
added example outputs that the user will see based on the inputs they…
Samueltansw 1d45d2e
Merge pull request #75 from Samueltansw/master
Samueltansw 1d96f34
minor edits to user guide
Samueltansw cc7362d
Merge pull request #76 from Samueltansw/master
Samueltansw b2e66bf
testing the hyperlink for TOC in user guide
Samueltansw 209244d
fixed bugs in table of content links, handled NoSuchElementException …
Samueltansw 2d2c2eb
minor edits to user guide
Samueltansw 8616f78
updated expected.txt
Samueltansw bdfed62
Merge pull request #141 from Samueltansw/master
Samueltansw 9dbf6e5
edited description of edit an income in user guide
Samueltansw 52388a0
Merge pull request #142 from Samueltansw/master
Samueltansw 2b0468b
added limit of 2dp for amount in user guide
Samueltansw efbdc7a
bolded 2dp in user guide
Samueltansw 7d9f6ab
Merge pull request #143 from Samueltansw/master
Samueltansw e2e2abb
added links to table of content at the end of every section in user g…
Samueltansw 1496062
Merge pull request #144 from Samueltansw/master
Samueltansw ef10749
Update UserGuide.md
namsengi11 7299b23
Update UserGuide.md
namsengi11 ea02332
Update UserGuide.md
namsengi11 655e924
Update UserGuide.md
namsengi11 55c2d52
correct minor issues for command instruction
namsengi11 5c2d377
Added exception handling for if the save files are tampered with and …
SpeciLiam 98c4973
Made it to where if the category is tampered with in the save file it…
SpeciLiam 151ac13
Met test expectations
namsengi11 d2e3187
resolve issue raised by PE-D
namsengi11 7021c33
resolve checkstyle issue
namsengi11 b0adcac
resolve checkstyle issue
namsengi11 237a975
resolve checkstyle issue
namsengi11 2c93593
resolve checkstyle issue
namsengi11 f2f1f4f
Merge pull request #145 from namsengi11/test
namsengi11 0942978
Merge branch 'AY2223S2-CS2113-F13-2:master' into master
SpeciLiam 9d70704
checkstyle
SpeciLiam 293a1d1
Merge pull request #146 from AY2223S2-CS2113-F13-2/master
SpeciLiam 83e9367
Update UserGuide.md
namsengi11 f5f2a5b
Update DeveloperGuide.md
namsengi11 a940f23
Create namsengi11.md
namsengi11 d522927
added duplicated flags exception for add commands, and also allowed t…
Samueltansw 86abf97
deleted comments to follow coding standard
Samueltansw d0f5239
updated expected.txt
Samueltansw 39b8054
Update UserGuide.md
namsengi11 1a9d762
Update namsengi11.md
namsengi11 9765d4a
updated SaveExpense and SaveIncome files to accept '/' character as d…
Samueltansw 62d6bb2
Merge pull request #147 from Samueltansw/modifyParser
Samueltansw bda6b9d
Add javadoc
namsengi11 0a84bb3
disallow user to enter flags as a new description when editing income…
Samueltansw d8da7a6
Merge remote-tracking branch 'upstream/master' into modifyParser
Samueltansw 44a6c22
minor edits
Samueltansw 2fcf6b4
minor edits
Samueltansw 65b0dbe
updated Expected.txt
Samueltansw 3ddc1ad
Merge pull request #149 from Samueltansw/modifyParser
Samueltansw c227d84
standardise 'eg.' in command summary in usre guide
Samueltansw 6bead31
Merge pull request #150 from Samueltansw/modifyParser
Samueltansw 92cb80d
deleted target.java as not in use, and added more JUnit Tests
Samueltansw 0e3488a
Merge pull request #151 from Samueltansw/branch-AddJunitTest2
Samueltansw 79b463a
renamed the functions in ParserTest
Samueltansw cdc1dbc
minor edits
Samueltansw cb5f69c
Merge pull request #152 from Samueltansw/branch-AddJunitTest2
Samueltansw ca76250
minor edits
Samueltansw e68d493
resolve PED issues
Samueltansw 12586c8
Update part of EntryList component and Parser component in DG
3526155
Add Sistine ppp
756a46d
Merge branch 'AY2223S2-CS2113-F13-2:master' into master
sistine-yu 0d28fcf
minor bugs
Samueltansw 95a114f
fixed checkstyle
Samueltansw b44c5ff
Merge pull request #153 from sistine-yu/master
sistine-yu d10a1f7
Merge pull request #154 from Samueltansw/resolvePED
Samueltansw ed21c3a
edited user guide and fixed some bugs
Samueltansw dca5d16
minor edits to user guide
Samueltansw b20b95e
updated Expected.txt
Samueltansw a535289
Merge pull request #155 from Samueltansw/master
Samueltansw 9360d66
minor edits to user guide
Samueltansw 4ce1fb8
fixed bugs in parser
Samueltansw d60b3ba
Merge pull request #156 from Samueltansw/master
Samueltansw 2ad2377
updated AboutUs.md and added PPP
Samueltansw cc9e3b2
Merge pull request #157 from Samueltansw/master
Samueltansw 3ada9cb
edited PPP
Samueltansw 2736f78
Merge pull request #158 from Samueltansw/master
Samueltansw b8864ae
added more stuff to PPP
Samueltansw 345dd86
Merge pull request #161 from Samueltansw/master
Samueltansw 345f1c8
added more stuff to PPP
Samueltansw 9e0aa6f
added more stuff to PPP
Samueltansw d7b37fd
fixed checkstyle
Samueltansw ae017cc
Merge pull request #162 from Samueltansw/master
Samueltansw 982e510
added link for contributions beyond team project
Samueltansw c47a18f
fixed spelling
Samueltansw 093535e
minor edits to PPP
Samueltansw efeb086
Merge pull request #163 from Samueltansw/master
Samueltansw 737dd17
updated README.MD and PPP
Samueltansw b60a003
Update the diagram in component part of DG
eae9b84
Update the component part of DG
91ff609
Merge pull request #164 from sistine-yu/master
sistine-yu 307e83d
Update PPP
17b5ee3
Merge branch 'AY2223S2-CS2113-F13-2:master' into master
sistine-yu faebaec
Merge pull request #165 from sistine-yu/master
sistine-yu d2727b8
Minor changes in DG
6b78032
Merge remote-tracking branch 'origin/master'
3cb38f0
Merge branch 'AY2223S2-CS2113-F13-2:master' into master
sistine-yu 41d6a92
trying out different links in PPP
Samueltansw f6d5943
updated the TOC in DG
Samueltansw 00f8614
updated PPP
Samueltansw da8b11a
updated the output for help command
Samueltansw 9a8b240
Update readme to display ppp in github pages
01b8b0b
Merge remote-tracking branch 'origin/master'
794132c
Merge pull request #166 from sistine-yu/master
sistine-yu 57d0614
handled merge conflicts
Samueltansw 016d71e
minor edits to DG
Samueltansw c5bbbe2
fixed merge conflicts
Samueltansw d979797
Merge pull request #167 from Samueltansw/master
Samueltansw a47912f
fixed bugs in architecture sequence diagram and added appendix: instr…
Samueltansw ca1ec8a
updated PPP and removed {more to be added} line in DG
Samueltansw ae2b063
updated PPP
Samueltansw a92fea0
Merge pull request #168 from Samueltansw/master
Samueltansw 7efa96f
fixed broken link
Samueltansw 863b420
Merge pull request #148 from namsengi11/documentation
namsengi11 de7b36f
added a maximum limit that can be entered as amount in UG, as well as…
Samueltansw 4bdf4fc
fixed checkstyle
Samueltansw c11127c
updated Expected.txt
Samueltansw c8c626b
Merge pull request #169 from Samueltansw/master
Samueltansw eaa96a5
Liam Van PPP
SpeciLiam 7f449a0
Merge pull request #170 from AY2223S2-CS2113-F13-2/master
SpeciLiam 4baa574
Add exception for dates smaller than earliest date
namsengi11 bcbcc6e
Resolve merge conflict issues
namsengi11 f57f83c
Resolve test conflicts
namsengi11 2faa2e0
Merge pull request #171 from namsengi11/time
namsengi11 78fb763
modified EntryListClassDiagram, modified descrption of parser compone…
Samueltansw d2705ea
Merge pull request #172 from Samueltansw/master
Samueltansw a450ae0
fixed grammar issues and spacing issues, and reorder diagram
Samueltansw 2ce6d99
Merge remote-tracking branch 'upstream/master'
Samueltansw a25f0c2
Add tests
namsengi11 af79552
resolve merge conflict
namsengi11 6e023f4
Merge branch 'master' of https://github.com/namsengi11/tp into test
namsengi11 77c1f98
Add intensive testing
namsengi11 7c679a5
Resolve checkstyle issues
namsengi11 70c924d
Resolve checkstyle issues
namsengi11 32a42c7
updated UG and fixed rounding issues in decimal values
Samueltansw e337077
minor edits to UG
Samueltansw 2694473
Merge pull request #174 from namsengi11/test
namsengi11 2bda6c3
Merge pull request #173 from Samueltansw/master
Samueltansw ada68d2
Update DeveloperGuide.md
namsengi11 33e53ca
Update DeveloperGuide.md
namsengi11 66fd211
Add files via upload
namsengi11 bd9103a
Delete BudgetClassUML.png
namsengi11 b5326c9
Add files via upload
namsengi11 20c949f
Create budget.puml
namsengi11 2aa4889
Update DeveloperGuide.md
namsengi11 5e62653
edited architecuture diagram, edited and moved the architecture diagr…
Samueltansw e93acd7
Merge remote-tracking branch 'upstream/master'
Samueltansw 6c7240b
fixed hyperlink for BudgetClassUML and slight edit to BudgetClassUML.…
Samueltansw 936f165
fixed hyperlink for BudgetClassUML and slight edit to BudgetClassUML.…
Samueltansw 8cf5e45
updated PPP
Samueltansw 0eedaa8
Merge pull request #175 from Samueltansw/master
Samueltansw 8effc32
edited DG
Samueltansw 5644062
minor change to parser class diagram
Samueltansw 07fa464
Merge pull request #176 from Samueltansw/master
Samueltansw c00c3ff
minor edit to PPP
Samueltansw 19e2dfd
Merge pull request #177 from Samueltansw/master
Samueltansw c3b74c6
minor edit to PPP and fixed bugs in editing dates in income and expense
Samueltansw 6e91979
removed commented code
Samueltansw 7a619a1
Merge pull request #178 from Samueltansw/master
Samueltansw fb2d078
added oldest date that can be entered in UG
Samueltansw a9cef23
Merge pull request #179 from Samueltansw/master
Samueltansw cfdd135
added more class diagrams to DG
Samueltansw 8c59177
Merge pull request #180 from Samueltansw/master
Samueltansw 6266cb2
updated TOC in DG
Samueltansw 15f7089
Merge pull request #181 from Samueltansw/master
Samueltansw b7eba58
edited budget class diagram
Samueltansw 0e75010
Merge pull request #182 from Samueltansw/master
Samueltansw 7c37e43
minor edits to DG
Samueltansw 0589eab
Merge pull request #183 from Samueltansw/master
Samueltansw c1cabf6
changed the name of .jar file
Samueltansw bf863a7
Merge pull request #184 from Samueltansw/master
Samueltansw 403f697
fixed bugs in setBudget command
Samueltansw ceac7b2
removed commented code
Samueltansw 6067fcf
fixed bugs in parser test
Samueltansw dd06f95
Merge pull request #185 from Samueltansw/master
Samueltansw 92430b8
Update DeveloperGuide.md
namsengi11 11bdbc7
Update DeveloperGuide.md
namsengi11 79e4fc3
added samuel's image and updated aboutus.md
Samueltansw 3cecba8
Add logging and reduce repetitive testing
namsengi11 258863c
Merge pull request #187 from Samueltansw/master
Samueltansw b916ae1
Merge pull request #186 from namsengi11/test
namsengi11 72e9066
updated UG
Samueltansw 4681e65
Delete D.jpg
namsengi11 4501284
Merge remote-tracking branch 'upstream/master'
Samueltansw 8038b7a
Add files via upload
namsengi11 f38c603
Update AboutUs.md
namsengi11 db2155f
Merge pull request #188 from Samueltansw/master
Samueltansw 46a5ab1
Update README.md
namsengi11 9797465
Update README.md
namsengi11 27677e6
Update README.md
namsengi11 834f42a
Update DeveloperGuide.md
namsengi11 192e185
Add date limit
namsengi11 4e0d340
Merge branch 'master' of https://github.com/namsengi11/tp into test
namsengi11 4d8770c
Update date exception message
namsengi11 0df51c7
Updated tests
namsengi11 b1e4253
Merge pull request #189 from namsengi11/test
namsengi11 020f182
updated UG
Samueltansw 44cfc43
Merge remote-tracking branch 'upstream/master'
Samueltansw 0966b3d
Merge pull request #190 from Samueltansw/master
Samueltansw a85966d
Update namsengi11.md
namsengi11 6eff9f9
Update namsengi11.md
namsengi11 af30554
Update namsengi11.md
namsengi11 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can consider adding a line break here so that "Methods" is on a new line