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.

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

[W16-3] Marketing Morph #68

Open
wants to merge 447 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
447 commits
Select commit Hold shift + click to select a range
bb4dc79
Merge pull request #71 from jkhiani/master
jkhiani Apr 1, 2019
9aa95cc
Fixed checkstyle
jkhiani Apr 1, 2019
681f08a
Merge pull request #72 from jkhiani/master
jkhiani Apr 1, 2019
282e3bf
Merge pull request #20 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 1, 2019
ef4c897
Merge pull request #13 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 2, 2019
44382b9
Shows suggestions to add when full name isn't typed
jkhiani Apr 2, 2019
3153d07
Updated Ui.png
jkhiani Apr 2, 2019
6b2e00e
Updated ug to include favorites
jkhiani Apr 2, 2019
541b239
Merge pull request #73 from jkhiani/master
jkhiani Apr 2, 2019
843cfa4
Merge pull request #21 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 2, 2019
b0c4f56
Finished Implementing Company
roanurquhart Apr 2, 2019
07f47d0
Merge pull request #74 from roanurquhart/master
roanurquhart Apr 2, 2019
d0f48cf
Fixed Checkstyle
roanurquhart Apr 2, 2019
402cfa9
Merge pull request #75 from roanurquhart/master
roanurquhart Apr 2, 2019
d99bdf5
Merge pull request #22 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 2, 2019
dc59dad
Fixed travis
roanurquhart Apr 2, 2019
9f6ab86
Merge pull request #76 from roanurquhart/master
roanurquhart Apr 2, 2019
9e78f34
Added boilerplate for CompanyListPanel
roanurquhart Apr 2, 2019
fd0367a
Merge pull request #77 from roanurquhart/master
roanurquhart Apr 2, 2019
7d87c93
checkstyle
roanurquhart Apr 2, 2019
4bc6ae9
Merge pull request #78 from roanurquhart/master
roanurquhart Apr 2, 2019
3f3b48e
Merge pull request #23 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 2, 2019
6c08d4a
Merge pull request #14 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 2, 2019
2a73276
Updated User Stories
roanurquhart Apr 2, 2019
869b6e3
Merge pull request #79 from roanurquhart/master
roanurquhart Apr 2, 2019
59fee77
Merge pull request #15 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 2, 2019
b3bbd99
Added addcpny and listcpny
roanurquhart Apr 2, 2019
611f312
Added company commands
roanurquhart Apr 2, 2019
60bff22
Removed duplicates
roanurquhart Apr 2, 2019
50bde1c
Merge pull request #80 from roanurquhart/master
roanurquhart Apr 2, 2019
85d92b5
Merge pull request #24 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 2, 2019
3e2ee21
Updated dg
jkhiani Apr 2, 2019
31dc1e5
Merge pull request #81 from jkhiani/master
jkhiani Apr 2, 2019
b02c46b
Created PPP
roanurquhart Apr 2, 2019
3c003d1
Updated PPP
roanurquhart Apr 2, 2019
a94368f
Updated PPP
roanurquhart Apr 2, 2019
e821ed2
Merge pull request #82 from roanurquhart/master
roanurquhart Apr 2, 2019
b1a8f64
Merge pull request #25 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 2, 2019
b4c4439
Updated PPP
jkhiani Apr 2, 2019
d4aa30b
Update AboutUs.adoc
jkhiani Apr 2, 2019
78ab3ea
Update AboutUs.adoc
jkhiani Apr 2, 2019
11b0899
Update AboutUs.adoc
jkhiani Apr 2, 2019
c59147a
Merge pull request #83 from jkhiani/master
jkhiani Apr 2, 2019
9132148
Merge pull request #16 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 2, 2019
2950e9c
Merge pull request #26 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 2, 2019
05515d0
Updated MainApp Version
roanurquhart Apr 2, 2019
bcbbd0d
Merge pull request #84 from roanurquhart/master
roanurquhart Apr 2, 2019
0d9dd5b
count number of persons;
ZhangJiayu0303 Apr 2, 2019
298b7c8
Update AddressBookParser.java
ZhangJiayu0303 Apr 2, 2019
037f075
Merge branch 'master' into master
ZhangJiayu0303 Apr 2, 2019
cc8f79e
Merge pull request #85 from ZhangJiayu0303/master
ZhangJiayu0303 Apr 2, 2019
8bdf554
modify UserGuide
ZhangJiayu0303 Apr 2, 2019
1a31602
Merge branch 'master' into master
ZhangJiayu0303 Apr 2, 2019
80d50de
Merge pull request #86 from ZhangJiayu0303/master
ZhangJiayu0303 Apr 2, 2019
d4d96df
Merge pull request #27 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 3, 2019
6551818
Merge pull request #17 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 3, 2019
d34ce44
AnalyzeCommand
ZhangJiayu0303 Apr 3, 2019
0d2f24a
Merge pull request #87 from ZhangJiayu0303/master
ZhangJiayu0303 Apr 3, 2019
937b4a3
Merge pull request #18 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 3, 2019
e113933
cleaned up statusbarfooter
jkhiani Apr 3, 2019
37d9742
Updated GUI to include company list
jkhiani Apr 3, 2019
2a3105f
Merge pull request #88 from jkhiani/master
jkhiani Apr 3, 2019
314f10e
Delete jkhiani.html
jkhiani Apr 3, 2019
628aa90
Merge pull request #28 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 5, 2019
2cbc55b
Merge pull request #1 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 5, 2019
d2672fb
Merge pull request #19 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 6, 2019
2ada8b1
Storage Attempt
roanurquhart Apr 7, 2019
b89849c
Worked on storage
roanurquhart Apr 7, 2019
976dd8b
Merge pull request #119 from roanurquhart/master
roanurquhart Apr 7, 2019
7392785
Merge pull request #20 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 8, 2019
7743cc1
Storage works for favorites
jkhiani Apr 8, 2019
90019f7
Added storage for companies
jkhiani Apr 8, 2019
f0ea807
Merge pull request #120 from jkhiani/master
jkhiani Apr 8, 2019
24c86e7
Fixed issue #99 user guide
jkhiani Apr 8, 2019
6e27885
Fixed typo in UG issue #109
jkhiani Apr 8, 2019
4671a38
Updated favorite section in UG fixed issue #105
jkhiani Apr 8, 2019
8b2fcb9
Updated SELECT description issue #106
jkhiani Apr 8, 2019
4e3249e
Updated JAR file name
jkhiani Apr 8, 2019
ac683a0
Merge pull request #121 from jkhiani/master
jkhiani Apr 8, 2019
d5228aa
Fixed checkstyle, testing compile errors
jkhiani Apr 8, 2019
76c2476
Merge pull request #122 from jkhiani/master
jkhiani Apr 8, 2019
cf40bdb
Deleted UG/DG html exports
jkhiani Apr 8, 2019
6b67033
Merge pull request #123 from jkhiani/master
jkhiani Apr 8, 2019
bda3982
Updated statusBarFooter to include company
jkhiani Apr 8, 2019
a7db961
Fixed checkstyle
jkhiani Apr 8, 2019
616249e
Merge pull request #124 from jkhiani/master
jkhiani Apr 8, 2019
f3983ba
Updated statusBarFooterTest
jkhiani Apr 8, 2019
0a86759
Merge pull request #125 from jkhiani/master
jkhiani Apr 8, 2019
a853c8e
Added javadoc for checkStyle
jkhiani Apr 8, 2019
0c51db2
Merge pull request #126 from jkhiani/master
jkhiani Apr 8, 2019
a7663b5
Fixed browserPanelTest
jkhiani Apr 8, 2019
b4bd8d1
Updated test data for jsonserializableaddressbook
jkhiani Apr 8, 2019
ff8e8cf
Updated logicManagerTest to include new attributes
jkhiani Apr 8, 2019
1b0e4f4
Updated tests
jkhiani Apr 8, 2019
3dacdfe
Merge pull request #127 from jkhiani/master
jkhiani Apr 8, 2019
7bfab60
Fixed test checkstyle
jkhiani Apr 8, 2019
ac72e97
Merge pull request #128 from jkhiani/master
jkhiani Apr 8, 2019
840c69d
Updated tests
jkhiani Apr 8, 2019
b0856df
Merge pull request #129 from jkhiani/master
jkhiani Apr 8, 2019
f130261
Removed unused imports
jkhiani Apr 8, 2019
873a8d6
Merge pull request #130 from jkhiani/master
jkhiani Apr 8, 2019
6dbb942
Can add different people w same everything except 1 attribute
jkhiani Apr 8, 2019
72808e1
Merge pull request #131 from jkhiani/master
jkhiani Apr 8, 2019
de14b42
Merge pull request #29 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 8, 2019
0dfeb2f
update UserGuide
roanurquhart Apr 8, 2019
634b567
added tags
roanurquhart Apr 8, 2019
ab2e62e
fixed tags
roanurquhart Apr 8, 2019
549b4f1
fixed PPP tags
roanurquhart Apr 8, 2019
653205e
Merge pull request #132 from roanurquhart/master
roanurquhart Apr 9, 2019
c5c81da
Merge pull request #30 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 9, 2019
907e0d3
Fixed Typos
roanurquhart Apr 9, 2019
ffe9136
Updated Summary
roanurquhart Apr 9, 2019
d7b9633
fixed quickstart
roanurquhart Apr 9, 2019
dfe5252
Added addcpny explanations
roanurquhart Apr 9, 2019
f356b83
Fixed Issues
roanurquhart Apr 9, 2019
63acf41
Merge branch 'master' of https://github.com/roanurquhart/main
roanurquhart Apr 9, 2019
b84b485
Merge pull request #133 from roanurquhart/master
roanurquhart Apr 9, 2019
4be2baa
Fix to edit and editcpny
roanurquhart Apr 9, 2019
edae80b
Merge pull request #2 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 9, 2019
1d871bb
add new command
FanDongzhe Apr 9, 2019
5b47b07
update'
FanDongzhe Apr 9, 2019
c53d4a1
modify
FanDongzhe Apr 9, 2019
a533019
Update UserGuide.adoc
FanDongzhe Apr 9, 2019
29d7123
Merge pull request #135 from FanDongzhe/master
FanDongzhe Apr 9, 2019
e259bab
Merge pull request #21 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 9, 2019
8c1490e
Merge pull request #134 from roanurquhart/master
jkhiani Apr 9, 2019
9e065ec
Merge pull request #22 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 9, 2019
8a12f79
Update user guide
FanDongzhe Apr 9, 2019
0fe9b13
Update user guide
FanDongzhe Apr 9, 2019
4e4ff16
upad medianCommand and analyzeCommand
ZhangJiayu0303 Apr 9, 2019
708880b
Merge pull request #136 from ZhangJiayu0303/master
ZhangJiayu0303 Apr 9, 2019
0f8f51a
Updated Ui.png
jkhiani Apr 10, 2019
b9a0240
Merge pull request #137 from jkhiani/master
jkhiani Apr 10, 2019
cf82a2f
Updated docs
jkhiani Apr 10, 2019
7e0172f
Merge pull request #138 from jkhiani/master
jkhiani Apr 10, 2019
e9a4a0e
Merge pull request #3 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 10, 2019
553e395
Merge pull request #31 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 10, 2019
2d7fcfe
fixed Median
roanurquhart Apr 10, 2019
f5c34ea
Merge pull request #139 from roanurquhart/master
roanurquhart Apr 10, 2019
8b20c63
ppp
roanurquhart Apr 10, 2019
f04634f
Merge pull request #140 from roanurquhart/master
roanurquhart Apr 10, 2019
01776a6
Merge pull request #23 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 11, 2019
5843413
Merge pull request #32 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 11, 2019
9bbc5b0
Added Test
roanurquhart Apr 11, 2019
2b44d24
Contributed to DG
roanurquhart Apr 11, 2019
7041bdd
Merge pull request #142 from roanurquhart/master
roanurquhart Apr 11, 2019
d4e7ff6
linked RepoSense
roanurquhart Apr 12, 2019
48c3b9c
Updated DG
roanurquhart Apr 12, 2019
fbf02e4
Merge branch 'master' of https://github.com/roanurquhart/main
roanurquhart Apr 12, 2019
6e1caa0
Updated PPP
roanurquhart Apr 12, 2019
290e98a
Merge pull request #143 from roanurquhart/master
roanurquhart Apr 12, 2019
89b674c
Merge pull request #24 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 13, 2019
8de798f
Updated ug/dg/ppp
jkhiani Apr 13, 2019
bed2e34
Merge pull request #144 from jkhiani/master
jkhiani Apr 13, 2019
9a9ef1a
add export command
FanDongzhe Apr 14, 2019
3a9842a
Merge pull request #145 from FanDongzhe/master
FanDongzhe Apr 14, 2019
7370a12
Merge pull request #5 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 14, 2019
5232acd
Merge pull request #25 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 14, 2019
39fd158
upda median,average,find
ZhangJiayu0303 Apr 14, 2019
f375e55
Merge pull request #146 from ZhangJiayu0303/master
ZhangJiayu0303 Apr 14, 2019
eb21c1c
Merge pull request #6 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
7959249
upda
ZhangJiayu0303 Apr 15, 2019
61d4839
upda
ZhangJiayu0303 Apr 15, 2019
6fc89c1
upda
ZhangJiayu0303 Apr 15, 2019
4109db0
Update UserGuide.adoc
ZhangJiayu0303 Apr 15, 2019
ca75b02
Update AverageSalaryCommand.java
ZhangJiayu0303 Apr 15, 2019
0823668
Update MedianSalaryCommand.java
ZhangJiayu0303 Apr 15, 2019
6ec1e9e
Update FindOccupationCommand.java
ZhangJiayu0303 Apr 15, 2019
f8ffd7c
Update FindOccupationCommandParser.java
ZhangJiayu0303 Apr 15, 2019
e2d6fff
Update OccupationContainsKeywordsPredicate.java
ZhangJiayu0303 Apr 15, 2019
c948885
Update FindSectorCommand.java
ZhangJiayu0303 Apr 15, 2019
707064a
Update FindSectorCommandParser.java
ZhangJiayu0303 Apr 15, 2019
9ecdd16
Update SectorContainsKeywordsPredicate.java
ZhangJiayu0303 Apr 15, 2019
049dd42
Merge pull request #33 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 15, 2019
c8a82e9
Update AverageSalaryCommand.java
ZhangJiayu0303 Apr 15, 2019
8240a35
Update MedianSalaryCommand.java
ZhangJiayu0303 Apr 15, 2019
5e46b99
Merge pull request #7 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
b74271f
add test for sort
FanDongzhe Apr 15, 2019
9fc2b75
update
FanDongzhe Apr 15, 2019
ef5136d
Merge pull request #147 from FanDongzhe/master
FanDongzhe Apr 15, 2019
fb9b928
fix bug
FanDongzhe Apr 15, 2019
1686075
Merge pull request #148 from FanDongzhe/master
FanDongzhe Apr 15, 2019
3fb88f3
Update UserGuide.adoc
FanDongzhe Apr 15, 2019
907b576
Updated listFavorites test
jkhiani Apr 15, 2019
d1dde79
Added eof for travis
jkhiani Apr 15, 2019
ea7bdd9
Merge pull request #26 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 15, 2019
357b131
Merge pull request #9 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
a79984e
Update UserGuide.adoc
FanDongzhe Apr 15, 2019
7cb28a7
Merge pull request #149 from FanDongzhe/master
FanDongzhe Apr 15, 2019
49fad06
Added favoriteCommandTest
jkhiani Apr 15, 2019
ed54ede
Merge pull request #150 from jkhiani/master
jkhiani Apr 15, 2019
80dde79
Merge pull request #27 from CS2103-AY1819S2-W16-3/master
jkhiani Apr 15, 2019
b141d68
Merge pull request #34 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 15, 2019
41b0e6b
Update UserGuide.adoc
ZhangJiayu0303 Apr 15, 2019
5160bef
Merge pull request #10 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
05bc27c
add ppp
FanDongzhe Apr 15, 2019
ccc972e
Update FanDongzhe.adoc
FanDongzhe Apr 15, 2019
6cb2303
Update FanDongzhe.adoc
FanDongzhe Apr 15, 2019
532fb64
Update FanDongzhe.adoc
FanDongzhe Apr 15, 2019
702f80c
Updated favorite tests
jkhiani Apr 15, 2019
41011a2
Merge pull request #151 from FanDongzhe/master
FanDongzhe Apr 15, 2019
e16809b
Merge pull request #152 from jkhiani/master
jkhiani Apr 15, 2019
108b46d
Added PPP html for roan
jkhiani Apr 15, 2019
e4cfd26
Merge pull request #153 from roanurquhart/master
roanurquhart Apr 15, 2019
7999911
Merge pull request #35 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 15, 2019
49e7488
Merge pull request #154 from jkhiani/master
jkhiani Apr 15, 2019
ee06d03
Update UserGuide.adoc
FanDongzhe Apr 15, 2019
5397b41
Merge pull request #36 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 15, 2019
a764669
Merge pull request #11 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
dcdf3a4
Merge pull request #155 from FanDongzhe/master
FanDongzhe Apr 15, 2019
43eca00
Update DeveloperGuide.adoc
ZhangJiayu0303 Apr 15, 2019
d0f3e11
Update DeveloperGuide.adoc
ZhangJiayu0303 Apr 15, 2019
bdf9454
Updated AboutUs
roanurquhart Apr 15, 2019
8c7d203
upda ppp
ZhangJiayu0303 Apr 15, 2019
829d41d
Merge pull request #37 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 15, 2019
5a348d8
Merge pull request #156 from roanurquhart/master
roanurquhart Apr 15, 2019
646fdcc
Update zhangjiayu0303.adoc
ZhangJiayu0303 Apr 15, 2019
f5d125b
Update zhangjiayu0303.adoc
ZhangJiayu0303 Apr 15, 2019
632b6d7
Update zhangjiayu0303.adoc
ZhangJiayu0303 Apr 15, 2019
37ba4e0
Update UserGuide.adoc
ZhangJiayu0303 Apr 15, 2019
7816475
Updated PPP
jkhiani Apr 15, 2019
d6bcda5
Merge branch 'master' into master
jkhiani Apr 15, 2019
d67ec72
Merge pull request #12 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
af6d960
Update DeveloperGuide.adoc
FanDongzhe Apr 15, 2019
04a2d86
Add files via upload
ZhangJiayu0303 Apr 15, 2019
041b111
Merge pull request #158 from FanDongzhe/master
FanDongzhe Apr 15, 2019
84cff0e
Merge pull request #13 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
152114a
add document
FanDongzhe Apr 15, 2019
0a47b5f
Merge pull request #159 from FanDongzhe/master
FanDongzhe Apr 15, 2019
512888f
Merge pull request #38 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 15, 2019
bc90fbf
update
FanDongzhe Apr 15, 2019
9268389
Merge pull request #160 from FanDongzhe/master
FanDongzhe Apr 15, 2019
e919e8f
Updated UG
roanurquhart Apr 15, 2019
9673dc6
Merge pull request #39 from CS2103-AY1819S2-W16-3/master
roanurquhart Apr 15, 2019
0cd4dad
Merge pull request #161 from roanurquhart/master
roanurquhart Apr 15, 2019
2ad13a8
Updated DG
roanurquhart Apr 15, 2019
0134971
Updated DG
roanurquhart Apr 15, 2019
0e56bac
upda zhangjiayu0303.adoc
ZhangJiayu0303 Apr 15, 2019
b3d7f71
Update UserGuide.adoc
ZhangJiayu0303 Apr 15, 2019
bf099df
Update DeveloperGuide.adoc
ZhangJiayu0303 Apr 15, 2019
0f09b8a
Update DeveloperGuide.adoc
ZhangJiayu0303 Apr 15, 2019
6dca7a6
add tag
FanDongzhe Apr 15, 2019
474e26b
Merge branch 'master' into master
FanDongzhe Apr 15, 2019
2226d6f
Merge pull request #14 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
05e6c4e
Update UserGuide.adoc
FanDongzhe Apr 15, 2019
3016bce
upda
ZhangJiayu0303 Apr 15, 2019
5f2be4d
upda html
ZhangJiayu0303 Apr 15, 2019
421ad5c
update html
FanDongzhe Apr 15, 2019
403e5d9
Merge pull request #15 from CS2103-AY1819S2-W16-3/master
FanDongzhe Apr 15, 2019
d904e12
Merge pull request #162 from FanDongzhe/master
FanDongzhe Apr 15, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
= Address Book (Level 4)
= Marketing Morph
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]


ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -14,19 +12,13 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* This is a desktop marketing application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is meant to be utilized by a marketing company in order to effectively organize *potential targets* and *potential clients*.

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

Expand All @@ -35,5 +27,6 @@ endif::[]
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
* AddressBook-Level4 project created by SE-EDU initiative at https://github.com/se-edu/

== Licence : link:LICENSE[MIT]
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'MarketingMorph.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down
51 changes: 21 additions & 30 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,44 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
Marketing Morph was developed by the https://github.com/orgs/cs2103-ay1819s2-w16-3/teams/developers[w16-3] team. +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Dongzhe Fan
image::FanDongzhe.png[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]

Role: Project Advisor
Role: Developer
Responsibilities: UG/DG maintenance

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Jiayu Zhang
image::zhangjiayu0303.png[width="150", align="left"]
{empty}[http://github.com/ZhangJiayu0303[github]] [<<johndoe#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Role: Developer
Responsibilities: UG/DG maintenance,

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Jitesh Khiani
image::jkhiani.png[width="150", align="left"]
{empty}[https://github.com/jkhiani[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Data
Role: Developer
Responsibilities: UG/DG maintenance, GH Repo maintenance, Favorites System, Maps Addition

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading

'''
=== Roan Urquhart
image::roanurquhart.png[width="150", align="left"]
{empty}[https://github.com/roanurquhart[github]] [<<roanurquhart#, portfolio>>]

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
Role: Developer
Responsibilities: UG/DG maintenance, GH Repo maintenance, Company Implementation

Role: Developer +
Responsibilities: UI

'''
Loading