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

[v1.5][T09-B2] CollegeZone #47

Open
wants to merge 833 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
833 commits
Select commit Hold shift + click to select a range
703cd54
Clean up CalendarPanel
fuadsahmawi Apr 13, 2018
450bf5f
Added new data util file to populate CollegeZone with sample reminder…
fuadsahmawi Apr 13, 2018
22536a8
Edited samplereminderdatautil.java
fuadsahmawi Apr 13, 2018
621c00f
Update goal and theme use cases
deborahlow97 Apr 13, 2018
c1262a2
Merge pull request #10 from CS2103JAN2018-T09-B2/master
zuweitrack Apr 13, 2018
775fb29
Edit typo and add sortgoal use case
deborahlow97 Apr 13, 2018
eb6f298
Merge branch 'master' into V1.5DeveloperGuide
deborahlow97 Apr 13, 2018
766655f
Edit RateCommand to handle invalid entries
Apr 13, 2018
3488202
Add username for collating
Apr 13, 2018
2f983bd
Edit RateCommand message
Apr 13, 2018
13dec3b
Merge pull request #229 from deborahlow97/V1.5DeveloperGuide
deborahlow97 Apr 13, 2018
9e1e439
Update sample project portfolio
Apr 13, 2018
67172ae
Edit SeekRaCommand message
Apr 13, 2018
af428a0
Edit rate command logic
Apr 13, 2018
ff7d0d3
Add ShowLofCommand
Apr 13, 2018
f5d4a09
Merge branch 'master' into v1.5-RateCommand
zuweitrack Apr 13, 2018
1186e43
Add import statement for ShowLofCommand
Apr 13, 2018
e189adc
Merge branch 'v1.5-RateCommand' of https://github.com/zuweitrack/main…
Apr 13, 2018
b9cf011
edit indentation
Apr 13, 2018
1cc1c1f
Merge pull request #231 from zuweitrack/v1.5-RateCommand
zuweitrack Apr 13, 2018
6915523
Merge pull request #11 from CS2103JAN2018-T09-B2/master
zuweitrack Apr 13, 2018
97df1f8
Add collate for main files
Apr 14, 2018
38b3de6
Edit ProjPortfolio and user guide
Apr 14, 2018
5193f3d
Edit project portfolio and user guide
Apr 14, 2018
e1cc3a3
Collate test
Apr 14, 2018
69eaf58
Merge pull request #42 from CS2103JAN2018-T09-B2/master
deborahlow97 Apr 14, 2018
36fb222
Shift rate command portion in user guide
Apr 14, 2018
2e3da1f
Edit proj portfolio
Apr 14, 2018
96cc55d
Edit user guide
Apr 14, 2018
362e0b7
Edit show portion of user guide
Apr 14, 2018
9761466
add newline at userguide
Apr 14, 2018
1960eb6
Merge branch 'master' into master
fuadsahmawi Apr 14, 2018
6bf5df2
Merge pull request #232 from zuweitrack/v1.5-Test-and-collate
zuweitrack Apr 14, 2018
cdef5f7
Merge branch 'master' into master
fuadsahmawi Apr 14, 2018
4e1541d
Add bubblegum theme
deborahlow97 Apr 14, 2018
7f011ec
Merge branch 'master' into V1.5NewThemeColour
deborahlow97 Apr 14, 2018
37cf851
Merge pull request #233 from fuadsahmawi/master
fuadsahmawi Apr 14, 2018
3e43a75
Merge branch 'master' into V1.5NewThemeColour
deborahlow97 Apr 14, 2018
fd4c4c6
Merge pull request #25 from CS2103JAN2018-T09-B2/master
fuadsahmawi Apr 14, 2018
b983eb1
Merge pull request #12 from CS2103JAN2018-T09-B2/master
zuweitrack Apr 14, 2018
9bebf93
Merge pull request #235 from deborahlow97/V1.5NewThemeColour
deborahlow97 Apr 14, 2018
d2f9a7a
Edit user guide format
Apr 14, 2018
516eeef
Update developer guide
Apr 14, 2018
38dcd2c
Deleted Print Statements
Apr 14, 2018
afd0f0a
Merge branch 'master' into personalPortfolio
sham-sheer Apr 14, 2018
db6a3a9
Merge pull request #237 from sham-sheer/personalPortfolio
sham-sheer Apr 14, 2018
4fe1a8e
UG changes
deborahlow97 Apr 14, 2018
0d7ef43
Merge branch 'master' into V1.5Documentation
deborahlow97 Apr 14, 2018
734e3b4
Merge pull request #239 from deborahlow97/V1.5Documentation
deborahlow97 Apr 14, 2018
57ece24
Update AboutUs
deborahlow97 Apr 14, 2018
c5f8cea
Update contact us
deborahlow97 Apr 14, 2018
5b696f9
Changed Birthday tests
Apr 14, 2018
1b85d39
Merge branch 'master' into personalPortfolio
sham-sheer Apr 14, 2018
962000d
Annoying Deborah
Apr 14, 2018
c5e1372
Merge branch 'personalPortfolio' of https://github.com/A0158738X/main…
Apr 14, 2018
cd3d814
Annoying Deborah
Apr 14, 2018
12e89a4
Annoying Deborah
Apr 14, 2018
9d5c495
Edited user guide
fuadsahmawi Apr 14, 2018
9f1a5f8
Update use cases
deborahlow97 Apr 14, 2018
25c4024
Merge branch 'master' into editUserGuide
fuadsahmawi Apr 14, 2018
238c87d
Merge pull request #241 from fuadsahmawi/editUserGuide
fuadsahmawi Apr 14, 2018
a4d1b2c
Merge branch 'master' into V1.5Documentation
deborahlow97 Apr 14, 2018
78696fd
Merge pull request #242 from deborahlow97/V1.5Documentation
deborahlow97 Apr 14, 2018
cfb4971
Edited Test files
Apr 14, 2018
fe8b58a
Merge branch 'master' into personalPortfolio
sham-sheer Apr 14, 2018
4c6a264
Edited Test files
Apr 14, 2018
13757d8
Changed images for reminder section
fuadsahmawi Apr 14, 2018
e18832f
Merge branch 'master' into editUserGuide
fuadsahmawi Apr 14, 2018
cc197cc
Merge pull request #240 from sham-sheer/personalPortfolio
sham-sheer Apr 14, 2018
b852429
Edit to pass checkstyle
fuadsahmawi Apr 14, 2018
647cd13
Merge branch 'master' into editUserGuide
fuadsahmawi Apr 14, 2018
5eb23f1
Merge pull request #243 from fuadsahmawi/editUserGuide
fuadsahmawi Apr 14, 2018
e8bac6b
Edited user guide
fuadsahmawi Apr 14, 2018
a2a7912
Merge branch 'editUserGuide' of https://github.com/fuadsahmawi/main i…
fuadsahmawi Apr 14, 2018
6b94050
Merge branch 'master' into editUserGuide
fuadsahmawi Apr 14, 2018
305a467
Merge pull request #245 from fuadsahmawi/editUserGuide
fuadsahmawi Apr 14, 2018
edeeced
Merge pull request #26 from CS2103JAN2018-T09-B2/master
fuadsahmawi Apr 14, 2018
f210c81
Edit use case
fuadsahmawi Apr 14, 2018
2245a31
Merge branch 'master' of https://github.com/fuadsahmawi/main into edi…
fuadsahmawi Apr 14, 2018
aee3303
Update developer guide images
deborahlow97 Apr 14, 2018
7e1c4ca
Update UG image and preamble
deborahlow97 Apr 14, 2018
929bbd5
Merge branch 'master' into V1.5Documentation
deborahlow97 Apr 14, 2018
caac39b
Merge pull request #246 from deborahlow97/V1.5Documentation
deborahlow97 Apr 14, 2018
990790f
Update UG DG
deborahlow97 Apr 14, 2018
e808c1f
Merge branch 'V1.5Documentation' of https://github.com/deborahlow97/m…
deborahlow97 Apr 14, 2018
04efdfa
Merge branch 'master' into V1.5Documentation
deborahlow97 Apr 14, 2018
96caf93
Edit dev guide
Apr 14, 2018
2d9765f
Merge pull request #247 from deborahlow97/V1.5Documentation
deborahlow97 Apr 14, 2018
c850cdf
Merge pull request #44 from CS2103JAN2018-T09-B2/master
deborahlow97 Apr 14, 2018
4794b8a
Edit Reminder feature in Developer Guide
fuadsahmawi Apr 14, 2018
33c81e2
Edited userguide and project portfolio
fuadsahmawi Apr 14, 2018
0937ea9
Merge branch 'master' into editDeveloperGuide
fuadsahmawi Apr 14, 2018
52a0abf
Merge pull request #13 from CS2103JAN2018-T09-B2/master
zuweitrack Apr 14, 2018
16ea065
Edit proj portfolio
Apr 14, 2018
c811429
Pull to local
Apr 14, 2018
a0bb682
Remove trailing whitespaces
fuadsahmawi Apr 14, 2018
c2fa8aa
Merge branch 'editDeveloperGuide' of https://github.com/fuadsahmawi/m…
fuadsahmawi Apr 14, 2018
04d9aa3
Edit dev guide
Apr 14, 2018
58693a6
Merge pull request #248 from fuadsahmawi/editDeveloperGuide
fuadsahmawi Apr 14, 2018
160935c
Update dev guide
deborahlow97 Apr 14, 2018
a1f01b9
Edit message in Rate Command
Apr 14, 2018
8654e19
Added tab autocomplete and its relevant test
Apr 14, 2018
93ece59
Merge branch 'V1.5Documentation' of https://github.com/deborahlow97/m…
deborahlow97 Apr 14, 2018
2d98925
Merge branch 'master' into master
deborahlow97 Apr 14, 2018
a873b5e
Added tab autocomplete and its relevant test
Apr 14, 2018
6306ff6
Merge branch 'master' of https://github.com/A0158738X/main
Apr 14, 2018
9335c56
Edit project portfolio and dev guide
Apr 14, 2018
f94be60
Delete file in wrong location
Apr 14, 2018
57838b6
Merge branch 'master' into v1.5-Developer-Guide-update
zuweitrack Apr 14, 2018
50f32e0
Merge pull request #251 from zuweitrack/v1.5-Developer-Guide-update
zuweitrack Apr 14, 2018
e51fde2
Merge pull request #14 from CS2103JAN2018-T09-B2/master
zuweitrack Apr 14, 2018
25b7d04
Added tab autocomplete and its relevant test
Apr 14, 2018
9831f88
Merge branch 'master' into master
sham-sheer Apr 14, 2018
54219cd
Update developer guide
deborahlow97 Apr 14, 2018
25191d0
Merge branch 'master' into V1.5Documentation
deborahlow97 Apr 14, 2018
3447b80
Add test for ShowLofCommand
Apr 14, 2018
f6ee080
Merge pull request #250 from sham-sheer/master
sham-sheer Apr 14, 2018
c4b96c3
Merge branch 'master' into V1.5Documentation
deborahlow97 Apr 14, 2018
cfb54d5
Merge pull request #252 from deborahlow97/V1.5Documentation
deborahlow97 Apr 14, 2018
ed58cb1
Collate main and test code
Apr 14, 2018
39a2abd
Merge pull request #45 from CS2103JAN2018-T09-B2/master
deborahlow97 Apr 14, 2018
1a21545
Add 2 RA persons to sample data util
Apr 14, 2018
6f25a65
Merge branch 'master' into v1.5-Test-Case-for-Rate-and-Show-Commands
zuweitrack Apr 14, 2018
e25f8b1
Removed unnecessary code
deborahlow97 Apr 14, 2018
90c9723
Add RA color tag
Apr 14, 2018
b845639
Merge branch 'v1.5-Test-Case-for-Rate-and-Show-Commands' of https://g…
Apr 14, 2018
5f89554
Merge pull request #254 from zuweitrack/v1.5-Test-Case-for-Rate-and-S…
zuweitrack Apr 14, 2018
66590be
Remove extra codes
deborahlow97 Apr 14, 2018
2ec1c98
Update UG DG
deborahlow97 Apr 14, 2018
1708988
Merge pull request #15 from CS2103JAN2018-T09-B2/master
zuweitrack Apr 15, 2018
c2c8c6c
More changes in dev guide
deborahlow97 Apr 15, 2018
7647cc2
update dg
deborahlow97 Apr 15, 2018
14bbbc9
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
339b370
Dev guide changes
deborahlow97 Apr 15, 2018
c698780
Update UG DG
deborahlow97 Apr 15, 2018
f4fbab8
Show pic in dev guide
Apr 15, 2018
26e93bf
Update UG
deborahlow97 Apr 15, 2018
29af6a8
Remove unused imports
deborahlow97 Apr 15, 2018
d1dddfc
Edit proj portfolio
Apr 15, 2018
d7afea8
Edit indentation proj portfolio
Apr 15, 2018
bab3504
UG update
deborahlow97 Apr 15, 2018
d1c8aac
Merge pull request #256 from zuweitrack/v1.5-Final-Dev-guide-edit
zuweitrack Apr 15, 2018
91e0a85
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
1751065
Edit dev guide picture
Apr 15, 2018
9c55aae
Merge pull request #257 from zuweitrack/v1.5-Final-Dev-guide-edit
zuweitrack Apr 15, 2018
ab457f8
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
2a4acd1
Fix pic error
Apr 15, 2018
d8e3d6a
Merge branch 'master' into v1.5-Final-Dev-guide-edit
zuweitrack Apr 15, 2018
9a6f52b
Merge pull request #258 from zuweitrack/v1.5-Final-Dev-guide-edit
zuweitrack Apr 15, 2018
965e849
Edit format
Apr 15, 2018
4e159e1
Merge pull request #259 from zuweitrack/v1.5-Final-Dev-guide-edit
zuweitrack Apr 15, 2018
fd2f670
Fixed file name
Apr 15, 2018
51a8ef8
Merge branch 'master' into v1.5-Final-Dev-guide-edit
zuweitrack Apr 15, 2018
173ad5b
Merge pull request #260 from zuweitrack/v1.5-Final-Dev-guide-edit
zuweitrack Apr 15, 2018
1d8e53a
Merge pull request #27 from CS2103JAN2018-T09-B2/master
fuadsahmawi Apr 15, 2018
452956b
More update on dev guide
deborahlow97 Apr 15, 2018
03e09ff
Merge branch 'V1.5Coderefactoring' of https://github.com/deborahlow97…
deborahlow97 Apr 15, 2018
35b6a52
More UG DG update
deborahlow97 Apr 15, 2018
59e4638
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
2f9bf1c
Merge pull request #255 from deborahlow97/V1.5Coderefactoring
deborahlow97 Apr 15, 2018
b6ced3c
Edit Developer Guide
fuadsahmawi Apr 15, 2018
85dfb46
Place table in aescending order
deborahlow97 Apr 15, 2018
51c0a32
Edit User Guide
fuadsahmawi Apr 15, 2018
7302214
Removed trailing whitespaces
fuadsahmawi Apr 15, 2018
8c7296c
Merge branch 'master' into editDeveloperGuide
fuadsahmawi Apr 15, 2018
2a89138
Merge pull request #261 from fuadsahmawi/editDeveloperGuide
fuadsahmawi Apr 15, 2018
574be32
Edit Project Portfolio
fuadsahmawi Apr 15, 2018
7e84ff7
Merge branch 'master' into projectPortfolio
fuadsahmawi Apr 15, 2018
893dce5
Merge pull request #262 from fuadsahmawi/projectPortfolio
fuadsahmawi Apr 15, 2018
dadc438
Updating the developer guide
Apr 15, 2018
eb94300
Final changes to v1.5 documentation
fuadsahmawi Apr 15, 2018
d79fb1c
Merge pull request #263 from fuadsahmawi/projectPortfolio
fuadsahmawi Apr 15, 2018
319a725
Merge pull request #28 from CS2103JAN2018-T09-B2/master
fuadsahmawi Apr 15, 2018
657b111
Changes in Project Portfolio
fuadsahmawi Apr 15, 2018
4d7a125
Edited introduction
fuadsahmawi Apr 15, 2018
453178b
Edited introduction
fuadsahmawi Apr 15, 2018
19ba82a
Removed trailing whitespaces
fuadsahmawi Apr 15, 2018
4931ab6
Merge pull request #264 from fuadsahmawi/projectPortfolio
fuadsahmawi Apr 15, 2018
d6e901c
V1.5 Project Portfolio
Apr 15, 2018
9e6c1f5
Merge branch 'master' of https://github.com/A0158738X/main
Apr 15, 2018
5cea0ed
V1.5 Project Portfolio
Apr 15, 2018
7e467d0
V1.5 Project Portfolio
Apr 15, 2018
49bcd42
Documentation
deborahlow97 Apr 15, 2018
9d3bc8c
Add tests
deborahlow97 Apr 15, 2018
febdb49
v1.5 Personal Portfolio
Apr 15, 2018
3ef460a
v1.5 Personal Portfolio
Apr 15, 2018
7ca9d20
v1.5 Personal Portfolio
Apr 15, 2018
7c84114
Update DG and add tests
deborahlow97 Apr 15, 2018
ff644ac
Merge branch 'V1.5Coderefactoring' of https://github.com/deborahlow97…
deborahlow97 Apr 15, 2018
1aec6ce
Merge pull request #266 from sham-sheer/sham-sheer-master
sham-sheer Apr 15, 2018
e35c515
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
cf79170
Update docs
deborahlow97 Apr 15, 2018
74649c4
Merge branch 'V1.5Coderefactoring' of https://github.com/deborahlow97…
deborahlow97 Apr 15, 2018
114ab16
Merge pull request #267 from deborahlow97/V1.5Coderefactoring
deborahlow97 Apr 15, 2018
8c5bfde
Update
deborahlow97 Apr 15, 2018
bb1b7d0
Update project portfolio
deborahlow97 Apr 15, 2018
c444e8a
Update UG
deborahlow97 Apr 15, 2018
6e10556
Fixed Birthday Sorting Issue
Apr 15, 2018
1a6ead0
Merge branch 'master' into sham-sheer-master
sham-sheer Apr 15, 2018
f409046
Completed DG
deborahlow97 Apr 15, 2018
7ecaf02
Merge pull request #268 from sham-sheer/sham-sheer-master
sham-sheer Apr 15, 2018
5327e84
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
a83c69f
Fix indentation
deborahlow97 Apr 15, 2018
e73b282
Merge pull request #269 from deborahlow97/V1.5Coderefactoring
deborahlow97 Apr 15, 2018
2b192c9
WRONG CODE
deborahlow97 Apr 15, 2018
19f88a7
Merge pull request #46 from CS2103JAN2018-T09-B2/master
deborahlow97 Apr 15, 2018
1a7320b
Update ppp
deborahlow97 Apr 15, 2018
484437b
UG DG final
deborahlow97 Apr 15, 2018
5122f1a
Edit
deborahlow97 Apr 15, 2018
60965d4
Merge pull request #270 from deborahlow97/v1.5final
deborahlow97 Apr 15, 2018
8d5a088
Fixed birthday bug
deborahlow97 Apr 15, 2018
3f7fead
Merge branch 'V1.5Coderefactoring' of https://github.com/deborahlow97…
deborahlow97 Apr 15, 2018
3f5cfbd
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
2f432b9
update ug
deborahlow97 Apr 15, 2018
3f64ca1
Merge branch 'V1.5Coderefactoring' of https://github.com/deborahlow97…
deborahlow97 Apr 15, 2018
ddb4c6e
updates
deborahlow97 Apr 15, 2018
1c76711
Update data util
deborahlow97 Apr 15, 2018
55d6f46
Add more tests
deborahlow97 Apr 15, 2018
5b7e395
Update birthday test
deborahlow97 Apr 15, 2018
879325e
Merge pull request #271 from deborahlow97/V1.5Coderefactoring
deborahlow97 Apr 15, 2018
c4dab30
Update ppp final
deborahlow97 Apr 15, 2018
d426fbf
Update typo
deborahlow97 Apr 15, 2018
964a16d
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
1913e22
Update typos
deborahlow97 Apr 15, 2018
8aedd70
Fix typo
deborahlow97 Apr 15, 2018
4a17c6b
Merge pull request #272 from deborahlow97/V1.5Coderefactoring
deborahlow97 Apr 15, 2018
daef627
Update typos
deborahlow97 Apr 15, 2018
6e3dfff
Merge branch 'V1.5Coderefactoring' of https://github.com/deborahlow97…
deborahlow97 Apr 15, 2018
1bfa06a
Merge branch 'master' into V1.5Coderefactoring
deborahlow97 Apr 15, 2018
861fec2
Merge pull request #273 from deborahlow97/V1.5Coderefactoring
deborahlow97 Apr 15, 2018
1cc7cd5
Merge pull request #47 from CS2103JAN2018-T09-B2/master
deborahlow97 Apr 15, 2018
2ac8d9b
Final collate
deborahlow97 Apr 15, 2018
8ba713c
Merge pull request #274 from deborahlow97/collatefinal
deborahlow97 Apr 15, 2018
de6975d
Update typo
deborahlow97 Apr 15, 2018
1d6deb5
Merge pull request #275 from deborahlow97/V1.5Coderefactoring
deborahlow97 Apr 15, 2018
089c3d0
Merge pull request #48 from CS2103JAN2018-T09-B2/master
deborahlow97 Apr 15, 2018
ea1c1a1
Remove file
deborahlow97 Apr 15, 2018
3d0fd08
Update Ui.png
deborahlow97 Apr 15, 2018
24467d5
Merge branch 'master' into collatefinal
deborahlow97 Apr 15, 2018
59dc583
Merge pull request #276 from deborahlow97/collatefinal
deborahlow97 Apr 15, 2018
d251738
update
deborahlow97 Apr 15, 2018
a0b864e
Merge branch 'collatefinal' of https://github.com/deborahlow97/main i…
deborahlow97 Apr 15, 2018
9f25394
Update
deborahlow97 Apr 15, 2018
864cfcd
Merge branch 'master' into collatefinal
deborahlow97 Apr 15, 2018
ffd6a7b
Merge pull request #277 from deborahlow97/collatefinal
deborahlow97 Apr 15, 2018
4a9f755
Update collated files
deborahlow97 Apr 16, 2018
c180847
Merge branch 'master' of https://github.com/deborahlow97/main
deborahlow97 Apr 16, 2018
6124dd0
Merge pull request #49 from CS2103JAN2018-T09-B2/master
deborahlow97 Apr 16, 2018
942df1f
Merge branch 'master' of https://github.com/deborahlow97/main
deborahlow97 Apr 16, 2018
ba882f2
Merge pull request #279 from deborahlow97/master
deborahlow97 Apr 16, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ lib/*
*.csv
config.json
src/test/data/sandbox/
src/test/java/systemtests/AddCommandSystemTest
preferences.json
.DS_Store
./screenshot*.png
Expand Down
Binary file added Collate-TUI.jar
Binary file not shown.
32 changes: 20 additions & 12 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
= Address Book (Level 4)
= CollegeZone
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://travis-ci.org/CS2103JAN2018-T09-B2/main[image:https://travis-ci.org/CS2103JAN2018-T09-B2/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/CS2103JAN2018-T09-B2/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-T09-B2/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"]
image::docs/images/Ui.png[width="800"]
endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
image::images/Ui.png[width="800"]
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.
Welcome to CollegeZone! CollegeZone is a custom application made for *National University of Singapore (NUS) Residential College 4 (RC4) students*. +
CollegeZone is designed for a RC4 student to manage their contacts with other RC4 students, manage their goals and to manage their time.
You can find many interesting features available in CollegeZone such as: +

* recording meetups +
* rating friends +
* creating goals +
* creating reminders +
* and many more!

The main reasons NUS freshmen chooses to stay in RC4 is to *forge new friendships* and to *perform well in their studies*. CollegeZone aims to aid in RC4 residents tasks management and maintaining the friendships forged in RC4. +
With CollegeZone's unique features, we aim to benefit your everyday life. +
Head over to our link:docs/UserGuide.adoc[user guide] to get started with CollegeZone!

== Site Map

Expand All @@ -36,5 +42,7 @@ 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/TomasMikula/EasyBind[EasyBind], 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/junit4[JUnit4]
* Credits to http://natty.joestelmach.com/[Joestalmach] for the date parsing NLP library
* Credits to to http://dlsc.com/products/calendarfx/[Dirk Lemmermann] for his calendar software

== Licence : link:LICENSE[MIT]
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ dependencies {
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
compile group: 'com.google.guava', name: 'guava', version: '19.0'
compile group: 'com.joestelmach', name: 'natty', version: '0.12'
compile group: 'com.calendarfx', name: 'view', version: '8.4.2'

testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.testfx', name: 'testfx-core', version: testFxVersion
Expand Down
Loading