[AY1920S1-CS2113-F10-3] AlphaNUS#78

Open

leowyh wants to merge 476 commits intonusCS2113-AY1920S1:masterfrom AY1920S1-CS2113T-F10-3:master

+9,895-57

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

Commits on Oct 24, 2019

Merge pull request #115 from E0373902/master
E0373902
authored
Modify UG & DG
karansarat
committed
Modify UG & DG
karansarat
committed
Modify UG & DG
karansarat
committed
Merge pull request #116 from karansarat/master
karansarat
authored
formatting changes to dg
Shriya Saxena
committed
solve merge conflicts
Shriya Saxena
committed
History feature DG
Shriya Saxena
committed
Merge pull request #117 from E0373902/master
E0373902
authored
added sequence diagram for history
Shriya Saxena
committed
Merge pull request #118 from E0373902/master
E0373902
authored
update UG
lijiayu980606
committed
Merge pull request #119 from lijiayu980606/master
lijiayu980606
authored

Commits on Oct 25, 2019

no message
leowyh
committed

Commits on Oct 26, 2019

Commits on Oct 27, 2019

Commits on Oct 28, 2019

Merge pull request #20 from AY1920S1-CS2113T-F10-3/master
lijiayu980606
authored
fixed some bugs
lijiayu980606
committed
Merge branch 'master' of https://github.com/lijiayu980606/main
lijiayu980606
committed
implemented assign budget feature
lijiayu980606
committed

Commits on Oct 29, 2019

Commits on Oct 30, 2019

Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
leowyh
committed
data/duke.txt minor update
Shriya Saxena
committed
Resolve conflicts in data/duke.txt
Shriya Saxena
committed
Added javadoc
leowyh
committed
Merge pull request #120 from leowyh/master
leowyh
authored
Updated UG and added base for own PPP
leowyh
committed
Merge pull request #21 from AY1920S1-CS2113T-F10-3/master
lijiayu980606
authored
view history for a certain time period
Shriya Saxena
committed
resolve merge conflicts
Shriya Saxena
committed
Merge pull request #122 from E0373902/master
E0373902
authored
Added PPP
leowyh
committed
Merge pull request #123 from leowyh/master
leowyh
authored

Commits on Oct 31, 2019

Commits on Nov 2, 2019

Commits on Nov 3, 2019

Commits on Nov 4, 2019

no message
Shriya Saxena
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
Shriya Saxena
committed
Storage for commandList
Shriya Saxena
committed
Added Storage functionality for Fund object
leowyh
committed
passed checkstyle
leowyh
committed

Commits on Nov 6, 2019

Undo/redo for add and delete project
Shriya Saxena
committed
Added JavaDoc
Shriya Saxena
committed
Undo redo for add/delete project, payee, payment
Shriya Saxena
committed
Merge pull request #23 from AY1920S1-CS2113T-F10-3/master
lijiayu980606
authored

Commits on Nov 7, 2019

Merge pull request #182 from E0373902/master
E0373902
authored
Limit the fund to be +ve and no more than 500,000 dollars. Add in reset fund function.
lijiayu980606
committed
Merge branch 'master' into master
lijiayu980606
authored
Minor ui change for assign fund
leowyh
committed
Set Projects.json to be ignored
leowyh
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
leowyh
committed
Fixed bug where files dont exist when user first starts program
leowyh
committed
pass checkstyle
leowyh
committed
Merge pull request #183 from leowyh/master
leowyh
authored
JUnit test for Project
leowyh
committed
Fixed list, edit and other minor tweaks
karansarat
committed
Fix merge conflicts
karansarat
committed
Merge pull request #24 from AY1920S1-CS2113T-F10-3/master
lijiayu980606
authored
fixed checkstyle bugs
lijiayu980606
committed
fix checkstyle
lijiayu980606
committed
fixed check style
lijiayu980606
committed
Merge pull request #184 from lijiayu980606/master
lijiayu980606
authored
Merge pull request #185 from karansarat/master
E0373902
authored
add in reminder function
lijiayu980606
committed
Merge branch 'master' into master
lijiayu980606
authored
add in command format
lijiayu980606
committed
Merge branch 'master' of https://github.com/lijiayu980606/main
lijiayu980606
committed
Enable to show the name of the project that the payment belongs for reminder function
lijiayu980606
committed
add in reminder function
lijiayu980606
authored
settled the bugs raised in the testing last week
lijiayu980606
committed
Merge pull request #187 from lijiayu980606/master
lijiayu980606
authored
Added functionality to store currentproject worked on after leaving the app
leowyh
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
leowyh
committed
Merge pull request #189 from leowyh/master
leowyh
authored
no message
Shriya Saxena
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
Shriya Saxena
committed

Commits on Nov 8, 2019

Commits on Nov 10, 2019

fixed checkstyles
lijiayu980606
committed
fix check style error
lijiayu980606
committed
Fixed loss of data bug
karansarat
committed
fixed check style
lijiayu980606
committed
fixed checkstyle
lijiayu980606
committed
Cleaning up Javadocs
karansarat
committed
add in manage task features
lijiayu980606
committed
update help page
lijiayu980606
committed
fixed checkstyle errors
lijiayu980606
committed
fix check style error
lijiayu980606
committed
Merge pull request #192 from lijiayu980606/master
lijiayu980606
authored
Functional build
karansarat
committed
Cleaning up and moving classes
leowyh
committed
Junit for Project and Project Manager, editing storage test
leowyh
committed
Fixed merge conflicts
karansarat
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
leowyh
committed
Merge pull request #194 from karansarat/master
leowyh
authored
Unit testing for Storage and ProjectManager
leowyh
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
leowyh
committed
Passed checkstyle
leowyh
committed
Merge pull request #191 from leowyh/master
leowyh
authored
Add in a few test cases
lijiayu980606
committed
add tests to addfund and setfund
lijiayu980606
committed
Merge branch 'master' into master
lijiayu980606
authored
Merge pull request #27 from AY1920S1-CS2113T-F10-3/master
lijiayu980606
authored
Renamed Ui.PNG to Ui.png
leowyh
committed
Updated Deleteproject ui and adding Instructions for Manual Testing in DG
leowyh
committed
Instructions for manual testing
leowyh
committed
Merge pull request #195 from leowyh/master
leowyh
authored

Commits on Nov 11, 2019

Merge pull request #28 from AY1920S1-CS2113T-F10-3/master
lijiayu980606
authored
added some tests
lijiayu980606
committed
Merge branch 'master' of https://github.com/lijiayu980606/main
lijiayu980606
committed
add in some testings
lijiayu980606
committed
check style
lijiayu980606
committed
pass testing
lijiayu980606
committed
-
lijiayu980606
committed
Merge pull request #196 from lijiayu980606/master
lijiayu980606
authored
added @author
Shriya Saxena
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
Shriya Saxena
committed
Updated Goto command to print list of projects for exception messages
leowyh
committed
Added new exception handling
karansarat
committed
Fixed merge conflicts
karansarat
committed
Renamed dataformat to dateformat
leowyh
committed
resolve errors due to merge conflict
Shriya Saxena
committed
Merge pull request #198 from E0373902/master
E0373902
authored
Fixing message bugs
karansarat
committed
add in storage for tasklist
lijiayu980606
committed
Fixed checkstyle
karansarat
committed
Merge branch 'master' into master
lijiayu980606
authored
Merge pull request #200 from karansarat/master
karansarat
authored
Updating dev guide
leowyh
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
leowyh
committed
Merge pull request #197 from leowyh/master
leowyh
authored
Merge branch 'master' into master
lijiayu980606
authored
Merge branch 'master' into master
lijiayu980606
authored
fixed check style
lijiayu980606
committed
update UG
lijiayu980606
committed
Merge pull request #199 from lijiayu980606/master
lijiayu980606
authored
removed redundant method in projectmanager, changed filepath for undo and redo fund to match current paths
leowyh
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
leowyh
committed
updated ug and readme.md (with new Ui.png)
lijiayu980606
committed
update UG (added in names)
lijiayu980606
committed
moved tasklist into task dolder
lijiayu980606
committed
Merge pull request #201 from lijiayu980606/master
lijiayu980606
authored
Junit tests and refactored project messages
leowyh
committed
Added exception message for undo and redo commands
Shriya Saxena
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
leowyh
committed
no message
Shriya Saxena
committed
passed checkstyle
leowyh
committed
Merge pull request #202 from leowyh/master
leowyh
authored
Merge pull request #29 from AY1920S1-CS2113T-F10-3/master
lijiayu980606
authored
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
Shriya Saxena
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
Shriya Saxena
committed
Added more robust exepction handling, updated UG/DG
karansarat
committed
Merge pull request #203 from E0373902/master
E0373902
authored
no message
Shriya Saxena
committed
Fixed merge conflicts
karansarat
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
karansarat
committed
Fixed merge bugs
karansarat
committed
Fixed checkstyle, 5 unit tests fail
karansarat
committed
Merge pull request #204 from karansarat/master
karansarat
authored
Removed debugging line
karansarat
committed
Merge pull request #205 from karansarat/master
karansarat
authored
Removed debugging line
karansarat
committed
Merge pull request #206 from karansarat/master
karansarat
authored
Fixed UG merge conflicts
karansarat
committed
Merge pull request #207 from karansarat/master
karansarat
authored
Modifying Dev Guide
leowyh
committed
Updated User Guide
leowyh
committed
Updated ug
Shriya Saxena
committed
updated ug
Shriya Saxena
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
Shriya Saxena
committed
Merge pull request #208 from E0373902/master
E0373902
authored
Update Dev Guide
leowyh
committed
Merge pull request #209 from leowyh/master
leowyh
authored
Updated PPP, Unit Tests
karansarat
committed
no message
Shriya Saxena
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
Shriya Saxena
committed
Completed PPP
karansarat
committed
update dg
lijiayu980606
committed
Merge pull request #210 from lijiayu980606/master
lijiayu980606
authored
no message
lijiayu980606
committed
Updated command formats
karansarat
committed
Merge pull request #211 from karansarat/master
leowyh
authored
Updated Unit Tests
karansarat
committed
Updated DG
Shriya Saxena
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F10-3/main
Shriya Saxena
committed
Merge pull request #213 from karansarat/master
karansarat
authored
Merge pull request #214 from E0373902/master
E0373902
authored
no message
lijiayu980606
committed
Merge pull request #212 from lijiayu980606/master
lijiayu980606
authored

Commits on Nov 13, 2019

Update Process.java
karansarat
authored