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

[T16-2] ProManage #46

Open
wants to merge 554 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 179 commits
Commits
Show all changes
554 commits
Select commit Hold shift + click to select a range
e6657fe
Update UserGuide.adoc
perrywzm Nov 2, 2018
189e4e0
Update UserGuide.adoc
perrywzm Nov 2, 2018
a573951
Merge pull request #9 from CS2113-AY1819S1-T16-2/master
Jeevz10 Nov 2, 2018
83f362c
Add parent class Time to allow easy comparison between StartTime and …
jieliangang Nov 2, 2018
2a4f6fd
Update parts which involve comparison between StartTime and EndTime
jieliangang Nov 2, 2018
3a4d6f3
Add hasClash method to Event
jieliangang Nov 2, 2018
0ac582d
Update hasClash method in Model
jieliangang Nov 2, 2018
9daf1d3
Update Invite Command. Now does not invite if event clashes with pers…
jieliangang Nov 2, 2018
bcc7a19
Update InviteCommandTest
jieliangang Nov 2, 2018
ffce907
Refactor EventClashPredicate
jieliangang Nov 2, 2018
3a20508
Clash feature added to EditEvent
jieliangang Nov 2, 2018
4ef940b
Vault Clash feature for EditEvent for further testing
jieliangang Nov 2, 2018
409b0b4
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 3, 2018
879e503
Fixed sort between lower and upper case
IcedCoffeeBoy Nov 3, 2018
fa66e37
Fixed checkstyle
IcedCoffeeBoy Nov 3, 2018
5ce98d3
Update Attendee to save email instead of name
jieliangang Nov 3, 2018
3b38b00
Make Name of Person editable
jieliangang Nov 3, 2018
c6c4ba1
Fix minor checkstyle error
jieliangang Nov 3, 2018
ec596bd
Update tests for new email uniqueness implementation
jieliangang Nov 3, 2018
0b20626
Fix checkstyle
jieliangang Nov 3, 2018
1a8dc37
Update comments
jieliangang Nov 3, 2018
98f1693
Merge pull request #106 from jieliangang/master
Jeevz10 Nov 3, 2018
66b540c
Merge pull request #10 from CS2113-AY1819S1-T16-2/master
Jeevz10 Nov 3, 2018
aaf5a30
Refactor Invite and Remove commands
jieliangang Nov 4, 2018
6357da8
Make Email case-insensitive
jieliangang Nov 4, 2018
2609a98
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 4, 2018
14cfc64
FindCommand now searches for email too
jieliangang Nov 4, 2018
e6a5f9a
Fix checkstyle
jieliangang Nov 4, 2018
b7faec1
Update EventListTest
jieliangang Nov 4, 2018
29f9b9b
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 5, 2018
cd2b0e5
Update InviteCommand tests
jieliangang Nov 5, 2018
ec11998
Remove Getting Started section from Developer Guide
jieliangang Nov 5, 2018
022affc
New tests for storage
IcedCoffeeBoy Nov 5, 2018
9f6fb9c
added if both events have the same end time, they will sort by date
IcedCoffeeBoy Nov 5, 2018
5493d85
Add AppVeyor build
jieliangang Nov 5, 2018
d19d4ee
Added in a designation attribute and extended the feature of login to…
Nov 5, 2018
d496901
Revert "Added in a designation attribute and extended the feature of …
Nov 5, 2018
0c72435
Revert "Revert "Added in a designation attribute and extended the fea…
Nov 5, 2018
d56aeb0
Revert "Added in a designation attribute and extended the feature of …
Nov 5, 2018
156d657
Revert "Revert "Added in a designation attribute and extended the fea…
Nov 5, 2018
bafe1ce
Added javadoc comment
Nov 5, 2018
2259ed2
Merge pull request #111 from jieliangang/master
Jeevz10 Nov 5, 2018
a81fd74
edit to fix the junit test
IcedCoffeeBoy Nov 5, 2018
ba8d2b6
Checkstyle error
Nov 5, 2018
04a3a66
Merge pull request #89 from IcedCoffeeBoy/master
jieliangang Nov 5, 2018
51aa6f2
Fixed Undo/Redo for Delete command (Changes both AB and EL states)
perrywzm Nov 5, 2018
9ffb21a
Added integration test for Undo/Redo/Invite/Delete commands. Consists…
perrywzm Nov 5, 2018
8221f76
Merge pull request #115 from perrythewang/UndoRedoFixed
jieliangang Nov 7, 2018
ac18477
Added sort command tests
IcedCoffeeBoy Nov 7, 2018
d991c82
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 7, 2018
2e9cccd
Unrevert the changes for typical event 3.
IcedCoffeeBoy Nov 7, 2018
c94dcae
Predicate for find event command created
r-farkhutdinov Nov 7, 2018
84fc26c
Fixed junit test errors
IcedCoffeeBoy Nov 7, 2018
51dac3f
Find event command created
r-farkhutdinov Nov 7, 2018
0e1d613
Parser for find event command created
r-farkhutdinov Nov 7, 2018
64a6bf9
Test cases for the command created; checkstyle errors fixed
r-farkhutdinov Nov 7, 2018
33c3c28
User guide updated
r-farkhutdinov Nov 7, 2018
0b75ea5
Fix Checkstyle
jieliangang Nov 7, 2018
9fc1b9b
Update DefaultParser.java
jieliangang Nov 7, 2018
ec4144c
Update SelectCommand
jieliangang Nov 7, 2018
d4c9635
Test case issue fix
r-farkhutdinov Nov 7, 2018
8497dba
Update User Guide
jieliangang Nov 7, 2018
ac54dc6
Merge branch 'master' of https://github.com/fr3ddy4/main
r-farkhutdinov Nov 7, 2018
38d0d3a
Update DG to fit latest product version
jieliangang Nov 7, 2018
f4de25e
Add PPP
jieliangang Nov 7, 2018
d1d5b5e
Fix tag format for Asciidoc include
jieliangang Nov 7, 2018
672e6c8
Merge pull request #118 from jieliangang/master
jieliangang Nov 7, 2018
d091025
Update AboutUs to include PPP link
jieliangang Nov 7, 2018
f94ac37
Merge pull request #119 from jieliangang/master
jieliangang Nov 7, 2018
511c9cb
LoginCommandParser implements Parser<LoginCommand>
IcedCoffeeBoy Nov 8, 2018
53f59d9
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 8, 2018
2fd6ef2
Merge pull request #116 from IcedCoffeeBoy/master
perrywzm Nov 8, 2018
9815510
Added new viewAttendees command class with tests (#121)
perrywzm Nov 8, 2018
09ba755
Added logout command and parser
IcedCoffeeBoy Nov 8, 2018
15e5887
Fixed checkstyle
IcedCoffeeBoy Nov 8, 2018
069ebea
Updated the Login Feature with improved test cases
Nov 8, 2018
0643136
Warning to user who try to login when they have already login
IcedCoffeeBoy Nov 8, 2018
8432675
Commments on the type
Nov 8, 2018
b2ec386
Prompt user to logout when using login in login piority
IcedCoffeeBoy Nov 8, 2018
858050e
Further changes
Nov 8, 2018
7e0ce58
Created Designation attribute to Person. Enhanced Login feature to al…
Jeevz10 Nov 8, 2018
95ca128
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 8, 2018
aac89a4
Give warning to user if they are using commands which they do not hav…
IcedCoffeeBoy Nov 8, 2018
02c9d3c
To give warning to user
IcedCoffeeBoy Nov 8, 2018
f245733
Update UG
jieliangang Nov 8, 2018
ed33e9e
Update SelectCommandParser to indicate correct error message
jieliangang Nov 8, 2018
7cdfb14
Change invalid parser into invalid exception class
IcedCoffeeBoy Nov 9, 2018
d29b57c
Added logout command and parser (#122)
IcedCoffeeBoy Nov 9, 2018
d3c0129
Merge branch 'master' into master
jieliangang Nov 9, 2018
ceefded
Merge pull request #117 from fr3ddy4/master
jieliangang Nov 9, 2018
3f7d40b
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 9, 2018
5f638d0
Update FindEventCommand and Fix EventContainsKeywordPredicateTest
jieliangang Nov 9, 2018
0749d4a
Add new overloaded Attendee constructor
jieliangang Nov 9, 2018
a37cb7d
Fixed unknown logout command when no user is login
IcedCoffeeBoy Nov 9, 2018
ed92e6a
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 9, 2018
c0b4746
Fixed javadoc
IcedCoffeeBoy Nov 9, 2018
2834f56
Update UI components
jieliangang Nov 9, 2018
0b480da
Update gui test for EventCard
jieliangang Nov 9, 2018
3038395
Added new showmine command for users login with their email
IcedCoffeeBoy Nov 9, 2018
c91dec8
Write gui test for EventListPanel
jieliangang Nov 9, 2018
257c9fb
Untagged on event and logincommand
IcedCoffeeBoy Nov 9, 2018
b2dafff
Remove BrowserPanel
jieliangang Nov 9, 2018
998c94a
Replace browserPanel with EventListPanel
jieliangang Nov 9, 2018
e252dcf
Remove tagging from logincommandparser
IcedCoffeeBoy Nov 9, 2018
fc474ff
Fix checkstyle
jieliangang Nov 9, 2018
d90ef88
Update method description for EventCard
jieliangang Nov 9, 2018
79ad95d
Added tagging in mainapp and explaining the part of code done by me
IcedCoffeeBoy Nov 9, 2018
a96c24a
Fixed tagging
IcedCoffeeBoy Nov 9, 2018
f295d60
Update addressbooktest
jieliangang Nov 9, 2018
cd31269
Update PPP
jieliangang Nov 9, 2018
36b3290
Undo changes to addressbooktest
jieliangang Nov 9, 2018
c6fa84a
Update TestApp to include EventList
jieliangang Nov 9, 2018
ecda7cd
Merge pull request #128 from jieliangang/master
Jeevz10 Nov 9, 2018
48c258f
Merge branch 'master' into master
Jeevz10 Nov 9, 2018
cd7f7f1
Merge pull request #12 from CS2113-AY1819S1-T16-2/master
Jeevz10 Nov 9, 2018
802905e
Merge branch 'master' into master
jieliangang Nov 9, 2018
d7918d9
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 9, 2018
72b39e4
Fixed checkstyle
IcedCoffeeBoy Nov 10, 2018
a4bbe1b
Merge branch 'master' of https://github.com/IcedCoffeeBoy/main
IcedCoffeeBoy Nov 10, 2018
186f25a
Starting on PPP
IcedCoffeeBoy Nov 10, 2018
dde16d7
Fix checkstyle
jieliangang Nov 10, 2018
8174ce4
Merge pull request #129 from jieliangang/master
jieliangang Nov 10, 2018
6039e43
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 10, 2018
60d5b2b
Add Systemtests for InviteCommand and RemoveCommand
jieliangang Nov 10, 2018
d579048
Fix checkstyle
jieliangang Nov 10, 2018
ca481f1
Fix system test to include events
jieliangang Nov 10, 2018
99f492b
Fix system tests
jieliangang Nov 10, 2018
4f1e229
Add tests for EditCommand
jieliangang Nov 10, 2018
edcba23
Fix checkstyle
jieliangang Nov 10, 2018
16dc2be
Fix storage test
jieliangang Nov 10, 2018
e6c3083
Update tests and improve code quality
jieliangang Nov 10, 2018
ab56b57
Minor refactoring
jieliangang Nov 10, 2018
b2dc6f2
Fix EditEventCommand bug when edited event clashes with other events
jieliangang Nov 10, 2018
64502e3
Update EditEventCommand tests
jieliangang Nov 10, 2018
fde4b53
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 10, 2018
b40545b
Created PPP and partial update the userguide
IcedCoffeeBoy Nov 10, 2018
79535ce
Update event command tests
jieliangang Nov 10, 2018
6df0b62
undo accidentally removol of gradle
IcedCoffeeBoy Nov 10, 2018
ec5f385
Undo changes on modelmanager
IcedCoffeeBoy Nov 10, 2018
adc48c2
Update EditCommand with Tests (#131)
jieliangang Nov 10, 2018
7b51dc4
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 10, 2018
2a964c3
Merge pull request #132 from IcedCoffeeBoy/master
jieliangang Nov 10, 2018
00eb86e
Update color scheme of UI
jieliangang Nov 10, 2018
202dacf
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 10, 2018
8db3d7f
Update LightTheme
jieliangang Nov 10, 2018
ba8de5a
Changes to user guide, developer guide, added personal PPP and change…
Nov 10, 2018
e7ca65b
Checkstyle
Nov 10, 2018
b3537a0
Merge branch 'master' into master
Jeevz10 Nov 10, 2018
1f7d0e4
Merge pull request #134 from jieliangang/master
Jeevz10 Nov 10, 2018
02df77b
111118_245 (#135)
Jeevz10 Nov 11, 2018
61751df
Fix for selectEvent to keep showing event after any changes to the ev…
perrywzm Nov 11, 2018
4628951
SortCommandParserTest
IcedCoffeeBoy Nov 11, 2018
f10899f
Merge pull request #138 from IcedCoffeeBoy/master
perrywzm Nov 11, 2018
09ae337
Rename viewAttendees to selectEvent (#139)
perrywzm Nov 11, 2018
e59ff5e
Edited the PPP
IcedCoffeeBoy Nov 11, 2018
f3299aa
Merge pull request #140 from IcedCoffeeBoy/master
jieliangang Nov 11, 2018
98e891a
Fix UI background color bug
jieliangang Nov 11, 2018
fb38615
Allow SelectEvent Command to highlight event selected
jieliangang Nov 11, 2018
e2cd7c0
Update selectEvent test after code update
jieliangang Nov 11, 2018
c578e46
Remove author tags on code that is collaborated with other teammates
IcedCoffeeBoy Nov 11, 2018
5c503d9
Merge pull request #142 from jieliangang/master
perrywzm Nov 11, 2018
2cbc63e
Merge pull request #141 from IcedCoffeeBoy/master
perrywzm Nov 11, 2018
29b0e1c
Add FindEvent to EmployeeParser andd ManagerParser and tests
jieliangang Nov 11, 2018
2b21e83
Add Ruslan's author name to RepoSense config
jieliangang Nov 11, 2018
d667f20
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 11, 2018
499a1e5
Add FindEvent to EmployeeParser andd ManagerParser (#143)
jieliangang Nov 11, 2018
71dcd96
Updated PPP, developer guide as well as new test
IcedCoffeeBoy Nov 11, 2018
0118dac
Merge pull request #144 from IcedCoffeeBoy/master
perrywzm Nov 11, 2018
ce90488
User guide, developer guide and the portfolio updated
r-farkhutdinov Nov 11, 2018
895d71c
Refactor test code
jieliangang Nov 11, 2018
2f0e376
Update code comments and quality
jieliangang Nov 11, 2018
14030d8
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 11, 2018
d06ae0c
Undo/Redo capability of sort has been removed as it clashes with the …
perrywzm Nov 11, 2018
e314195
Fix checkstyle
jieliangang Nov 11, 2018
7ffe5e4
Update Developer Guide
jieliangang Nov 11, 2018
ea3c062
Cleaned code
perrywzm Nov 11, 2018
1ef160d
Merge pull request #145 from perrythewang/Updates
perrywzm Nov 11, 2018
6b6bf57
Merge pull request #146 from jieliangang/master
perrywzm Nov 11, 2018
b927fe3
Refactored exceptions out of ModelManager to be standalone
perrywzm Nov 11, 2018
6b1d460
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/mai…
perrywzm Nov 11, 2018
45fa35d
Added tests for undo redo methods in ModelManager
perrywzm Nov 11, 2018
2932000
Updated VersionedAddressBookTest
perrywzm Nov 11, 2018
93d5b36
Fixed checkstyle
perrywzm Nov 11, 2018
c9933e2
Added tests for VersionedEventList
perrywzm Nov 11, 2018
de85135
Fixed checkstyle
perrywzm Nov 11, 2018
e11ec36
Update Sample Data for Final Demo and Ui png
jieliangang Nov 11, 2018
f0c9bf7
Merge pull request #147 from perrythewang/Updates
jieliangang Nov 11, 2018
9493090
Merge pull request #148 from perrythewang/Updates2
jieliangang Nov 11, 2018
41d0e14
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 11, 2018
4272e36
Added tests for DeleteEventCommand
perrywzm Nov 11, 2018
01771eb
Added test cases to undo/redo integration tests
perrywzm Nov 11, 2018
13a0c25
Merge pull request #149 from jieliangang/master
perrywzm Nov 11, 2018
4260d83
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/mai…
perrywzm Nov 11, 2018
0d86ced
Merge branch 'master' into master
Jeevz10 Nov 11, 2018
03aa174
Merge pull request #13 from CS2113-AY1819S1-T16-2/master
Jeevz10 Nov 11, 2018
f5f4917
Added selectEvent to user guide
perrywzm Nov 11, 2018
5a15803
Updated user guide and developer guide
Nov 12, 2018
9348139
Merge branch 'master' of https://github.com/Jeevz10/main
Nov 12, 2018
bff67a0
Make Location case insensitive
jieliangang Nov 12, 2018
9be635b
Merge pull request #150 from perrythewang/Updates2
jieliangang Nov 12, 2018
a6e8e00
Update UG, DG and PPP for v1.4
jieliangang Nov 12, 2018
8f84db7
Merge pull request #151 from perrythewang/Updates
jieliangang Nov 12, 2018
ae4aaec
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 12, 2018
2967ade
Updated the PPP and user guide
Nov 12, 2018
a3b1c8c
Merge pull request #154 from jieliangang/master
jieliangang Nov 12, 2018
34c52e1
Merge branch 'master' into master
Jeevz10 Nov 12, 2018
99b333a
Merge pull request #155 from Jeevz10/master
Jeevz10 Nov 12, 2018
8d8463d
Merge pull request #14 from CS2113-AY1819S1-T16-2/master
Jeevz10 Nov 12, 2018
44e8d15
PPP fix
r-farkhutdinov Nov 12, 2018
1914e5a
Merge branch 'master' into master
r-farkhutdinov Nov 12, 2018
bbfe842
Merge pull request #156 from fr3ddy4/master
jieliangang Nov 12, 2018
9ce0c4d
Update UGDG and PPP
jieliangang Nov 12, 2018
4f74fa2
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 12, 2018
0a6cdd8
Updated PPP and developer guide
IcedCoffeeBoy Nov 12, 2018
a4f5776
Updated the PPP and user guide and developer guide, add and edit comm…
Nov 12, 2018
fb6404c
Added Undo/Redo implementation to Developer Guide
perrywzm Nov 12, 2018
935f428
Merge pull request #157 from IcedCoffeeBoy/master
Jeevz10 Nov 12, 2018
fc33060
Remove copied portion in ruslan's PPP
jieliangang Nov 12, 2018
47015d7
Merge branch 'master' of git://github.com/CS2113-AY1819S1-T16-2/main …
perrywzm Nov 12, 2018
4929c3b
Checkstyle
Nov 12, 2018
ea6276f
Added Undo/Redo implementation to Developer Guide (#158)
perrywzm Nov 12, 2018
6711315
Merge pull request #159 from Jeevz10/master
perrywzm Nov 12, 2018
95b155a
Include manual test case for login and sort command
IcedCoffeeBoy Nov 12, 2018
c1e6b3f
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T16-2/main
IcedCoffeeBoy Nov 12, 2018
cef4959
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 12, 2018
a01f9f2
Added PPP, updated userguide and developer guide
perrywzm Nov 12, 2018
70ae8f7
Merge branch 'master' of git://github.com/CS2113-AY1819S1-T16-2/main …
perrywzm Nov 12, 2018
0a410c7
Increase width
Nov 12, 2018
9d66c3c
Added some test case line to the PPP
perrywzm Nov 12, 2018
62301d8
Merge pull request #160 from IcedCoffeeBoy/master
jieliangang Nov 12, 2018
1fde4b8
Update UG DG PPP for Jie Liang
jieliangang Nov 12, 2018
4232ab7
Update UG overall
jieliangang Nov 12, 2018
dccdc98
Added test case of selectEvent to developer guide
perrywzm Nov 12, 2018
076a840
Merge pull request #162 from Jeevz10/master
perrywzm Nov 12, 2018
ff87686
Update DG overall
jieliangang Nov 12, 2018
08bad6f
Merge pull request #161 from perrythewang/FinalUpdates
jieliangang Nov 12, 2018
86760f3
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 12, 2018
83847ce
Chopped down the overly long PPP
perrywzm Nov 12, 2018
f25a378
Merge pull request #163 from jieliangang/master
perrywzm Nov 12, 2018
1eb2be2
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 12, 2018
8fb23ac
Merge pull request #164 from perrythewang/FinalUpdates
jieliangang Nov 12, 2018
a98ff86
Minor refactoring
jieliangang Nov 12, 2018
9b2d4fa
Merge remote-tracking branch 'upstream/master'
jieliangang Nov 12, 2018
7796f3d
Update Jeevan's PPP
jieliangang Nov 12, 2018
07e0d7a
Merge pull request #165 from jieliangang/master
perrywzm Nov 12, 2018
f496da3
PPP fix
perrywzm Nov 12, 2018
9d434a1
Merge pull request #166 from perrythewang/FinalUpdates
perrywzm Nov 12, 2018
ff03eb2
updated ppp (#167)
IcedCoffeeBoy Nov 12, 2018
4964c69
Updated user guide (#168)
IcedCoffeeBoy Nov 12, 2018
8fcaaad
updated guide (#169)
IcedCoffeeBoy Nov 12, 2018
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
26 changes: 13 additions & 13 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
= Address Book (Level 4)
= ProManage
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/nusCS2113-AY1819S1/addressbook-level4[image:https://travis-ci.org/nusCS2113-AY1819S1/addressbook-level4.svg?branch=master[Build Status]]
https://travis-ci.org/CS2113-AY1819S1-T16-2/main[image:https://travis-ci.org/CS2113-AY1819S1-T16-2/main.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://coveralls.io/github/CS2113-AY1819S1-T16-2/main[image:https://coveralls.io/repos/github/CS2113-AY1819S1-T16-2/main/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]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]


ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,13 +15,14 @@ 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 Project Management application designed for project-based companies. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* We provide an all-in-one platform that saves our consumers’ time and money. Our customers will feel at ease communicating with one another in their project team setting.
* Managers of project team are now able to oversee their employees and overall project easily and conveniently.

* Features:
** Project teams management.
** Employees management.
** Department management.

== Site Map

Expand All @@ -33,8 +34,7 @@ endif::[]

== Acknowledgements

* 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_.
* Based of https://github.com/se-edu/addressbook-level4[AddressBook-Level4 project] created by the https://github.com/se-edu/[SE-EDU initiative]
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
Expand Down
57 changes: 30 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,56 @@
: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} +
ProManage was developed by the https://github.com/orgs/CS2113-AY1819S1-T16-2/teams/developers[T16-2] 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>>]
=== Lee Ming Liang
image::icedcoffeeboy.png[width="150", align="left"]
{empty}[https://github.com/IcedCoffeeBoy[github]] [<<#, portfolio>>]

Role: Project Advisor
**Role:** Developer +
**Responsibilities:** In charge of Storage

'''

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

Role: Team Lead +
Responsibilities: UI
=== Jie Liang Ang
image::jieliangang.png[width="150", align="left"]
{empty}[https://github.com/jieliangang[github]] [<<#, portfolio>>]

**Role:** Team Lead +
**Responsibilities:** Integration, Scheduling and Tracking

'''

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

Role: Developer +
Responsibilities: Data
=== Jeevan Neralakere Somashekhar
image::jeevz10.png[width="150", align="left"]
{empty}[https://github.com/Jeevz10[github]] [<<#, portfolio>>]

**Role:** Developer +
**Responsibilities:** Documentation


'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
**Role:** Developer +
**Responsibilities:** Testing

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Ruslan Farkhutdinov
image::fr3ddy4.png[width="150", align="left"]
{empty}[https://github.com/fr3ddy4[github]] [<<#, portfolio>>]

Role: Developer +
Responsibilities: UI
**Role:** Developer +
**Responsibilities:** Code Quality Assurance

'''
3 changes: 1 addition & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/CS2113-AY1819S1-T16-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
Loading