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

[T09-4] FinancialPlanner #101

Open
wants to merge 1,064 commits into
base: master
Choose a base branch
from
Open

[T09-4] FinancialPlanner #101

wants to merge 1,064 commits into from

Conversation

tenvinc
Copy link

@tenvinc tenvinc commented Oct 31, 2018 •
edited
Loading

OscarZeng and others added 26 commits November 7, 2018 21:29
@OscarZeng
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main …
1180a44 
…into Latest_UGDG_Update

# Conflicts:
#	docs/DeveloperGuide.adoc
#	docs/UserGuide.adoc
@tenvinc
updated command summary
4d48d5e
@tenvinc
Merge branch 'master' into vincent
36edd0e
@OscarZeng
Tests fixed.
fc82058
@tenvinc
Merge pull request #173 from CS2113-AY1819S1-T09-4/Latest_UGDG_Update
31a8bb3 
Latest ugdg update
@OscarZeng
Merge branch 'master' into vincent
d3cca51
@tenvinc
fixed user guide
86d4d17
@OscarZeng
Update UserGuide.adoc
034c8da 
Some small changes
@tztzt
Merge pull request #175 from CS2113-AY1819S1-T09-4/Latest_UGDG_Update
7fce28e 
Update UserGuide.adoc
@tenvinc
Merge branch 'master' into vincent
d439031
@tenvinc
Merge pull request #174 from CS2113-AY1819S1-T09-4/vincent
7ab351e 
Vincent
@nguyenngoclinhchi
On the way modify UG DG
95f10f2
@nguyenngoclinhchi
Merge branch 'master' of https://github.com/nguyenngoclinhchi/address…
0771e01 
…book-level4
@nguyenngoclinhchi
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main
9decd29
@tenvinc
updated build
643810b
@tztzt
Refactor Suggestions
14b672f
@tztzt
Refactor
34e52a6
@tztzt
Checkstyle Error
f6e56ec
@tenvinc
Merge pull request #177 from CS2113-AY1819S1-T09-4/Refactor_Functions
6eacd7c 
Refactor Autocomplete + Update Autocomplete Library
@tztzt
Merge pull request #178 from CS2113-AY1819S1-T09-4/vincent_refactor
60ee45b 
updated build
@nguyenngoclinhchi
Partially update UG DG
836937a
@tztzt
Wrote some authoring, and renamed PPP.
58632b6
@nguyenngoclinhchi
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main
135ba86
@OscarZeng
Some changes about the portfolio and authorizing addings
874c13c
@OscarZeng
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main …
548c109 
…into Latest_UGDG_Update
@OscarZeng
Merge pull request #179 from CS2113-AY1819S1-T09-4/Refactor_Functions
8923510 
Wrote some authoring, and renamed PPP.
OscarZeng and others added 30 commits November 12, 2018 20:59
@OscarZeng
More modification about the DG and portfolio
be33872
@tztzt
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main …
0408f3b 
…into UGDG_ZT

# Conflicts:
#	docs/DeveloperGuide.adoc
#	docs/UserGuide.adoc
@tenvinc
updated ppp to less than 10 pages
156c3ea
@tenvinc
Merge pull request #206 from CS2113-AY1819S1-T09-4/Latest_UGDG_Update
9a02f15 
Latest ugdg update
@OscarZeng
Merge pull request #207 from CS2113-AY1819S1-T09-4/vincent_last
8f8ef62 
updated ppp to less than 10 pages
@tztzt
Updated to 10Page PPP
fe238ae
@tztzt
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main …
28a95ea 
…into UGDG_ZT

# Conflicts:
#	docs/AboutUs.adoc
#	docs/UserGuide.adoc
@tztzt
Fix
7ec8395
@tztzt
Fixes
70c245b
@tenvinc
Merge pull request #208 from CS2113-AY1819S1-T09-4/UGDG_ZT
d89b8db 
ZT UGDG
@tenvinc
Merge pull request #205 from nguyenngoclinhchi/master
9e30e06 
Update nguyenngoclinhchi.adoc
@OscarZeng
Make the portfolio into 10 pages & fixed some of the bugs of DG
d9e9a78
@nguyenngoclinhchi
no message
26f0d82
@tztzt
Updated DG with Manual Tests for me
dc86e8a
@tztzt
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main …
22f9dc5 
…into UGDG_ZT
@tenvinc
Merge pull request #209 from nguyenngoclinhchi/master
4bd5f83 
Final update UG DG
@tztzt
checkstyle
d5229c2
@tenvinc
Update build.gradle
f2ef1ca
@OscarZeng
Adjust the size of portfolio
6e99d42
@tztzt
Merge pull request #210 from CS2113-AY1819S1-T09-4/UGDG_ZT
d87f0a8 
UGDG ZT
@tenvinc
Update _header.html.slim
881b7e0
@OscarZeng
Merge pull request #211 from CS2113-AY1819S1-T09-4/Latest_UGDG_Update
89307b4 
Last change
@tztzt
Changing my Portfolio
138e3b8
@tztzt
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main …
df985e3 
…into UGDG_ZT
@tztzt
Merge pull request #212 from CS2113-AY1819S1-T09-4/UGDG_ZT
fddb9d8 
ZT Changing PPP
@tenvinc
Update UserGuide.adoc
652aee7
@tztzt
Updated my PPP appearance
fbb095a
@tztzt
Missing end sentence
676ef27
@tenvinc
commit tag
4a6b3b9
@tztzt
Merge pull request #213 from CS2113-AY1819S1-T09-4/UGDG_ZT
d8edcc0 
Missing Sentence
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephlewyh stephlewyh Awaiting requested review from stephlewyh

Assignees

@RubaP RubaP

Labels
team.4 tutorial.T09
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@tenvinc @RubaP @nus-se-pr-bot @OscarZeng @tztzt @nguyenngoclinhchi