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

[CS2103T-T10-3] ELISA #133

Open
wants to merge 1,190 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1190 commits
Select commit Hold shift + click to select a range
c96a5a5
Fix ui.
Icesiolz Nov 8, 2019
ccb8efc
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T10-3/main
Icesiolz Nov 8, 2019
5015d61
Merge branch 'master' of https://github.com/Icesiolz/main
Icesiolz Nov 8, 2019
aec00da
Update UserGuide.adoc
Icesiolz Nov 8, 2019
8d376ce
Update UserGuide.adoc
Icesiolz Nov 8, 2019
8ff9e8b
Update UserGuide.adoc
Icesiolz Nov 8, 2019
fede773
Add images for docs.
Icesiolz Nov 8, 2019
d4213bc
Merge branch 'master' of https://github.com/Icesiolz/main
Icesiolz Nov 8, 2019
96d23b1
Update UserGuide.adoc
Icesiolz Nov 8, 2019
d5b7f33
Update UserGuide.adoc
Icesiolz Nov 8, 2019
ce2f4c6
Update UserGuide.adoc
Icesiolz Nov 8, 2019
b1d7e33
Update UserGuide.adoc
Icesiolz Nov 8, 2019
f764dc6
Update UserGuide.adoc
Icesiolz Nov 8, 2019
b794010
Update DevOps.adoc
Icesiolz Nov 8, 2019
d11bd2f
Update Documentation.adoc
Icesiolz Nov 8, 2019
0c02b47
Update SettingUp.adoc
Icesiolz Nov 8, 2019
2752cce
Write PPP
Nov 8, 2019
46dbe22
Change implementation of focus mode to use 2 different parsers
sianghwee Nov 8, 2019
8e45a05
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T10-3/ma…
sianghwee Nov 8, 2019
d2c62f5
Add more jokes
Nov 8, 2019
9649744
Merge pull request #262 from Icesiolz/master
sianghwee Nov 9, 2019
c3e4562
Merge branch 'master' into master
sianghwee Nov 9, 2019
dfb7dbf
Update developer guide to change the implementation of focus mode
sianghwee Nov 9, 2019
559a51f
Merge branch 'master' of https://github.com/sianghwee/main
sianghwee Nov 9, 2019
4a5b591
Merge branch 'master' into focus-mode-fix
sianghwee Nov 9, 2019
1b2845d
Fix grammatical errors
sianghwee Nov 9, 2019
3f1b91b
Added easy and hard mode to game.
Icesiolz Nov 9, 2019
b15d3d9
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T10-3/main
Icesiolz Nov 9, 2019
886a555
Added easy and hard mode to game.
Icesiolz Nov 9, 2019
ec533e6
Added easy and hard mode to game.
Icesiolz Nov 9, 2019
7947f06
Merge pull request #261 from sianghwee/master
Icesiolz Nov 9, 2019
e9129da
Merge branch 'master' into more-joke
Icesiolz Nov 9, 2019
acc8d84
Merge branch 'master' into master
Icesiolz Nov 9, 2019
efbd4c8
Added easy and hard mode to game.
Icesiolz Nov 9, 2019
fb05373
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T10-3/main
Icesiolz Nov 9, 2019
f70f451
Merge branch 'master' of https://github.com/Icesiolz/main
Icesiolz Nov 9, 2019
320881c
Merge branch 'master' into focus-mode-fix
sianghwee Nov 9, 2019
5857e42
Added easy and hard mode to game.
Icesiolz Nov 9, 2019
79d0f12
Merge pull request #264 from lrchema/more-joke
Icesiolz Nov 9, 2019
e8f6053
Merge branch 'master' into master
Icesiolz Nov 9, 2019
4bed9b7
Merge branch 'master' into focus-mode-fix
Icesiolz Nov 9, 2019
2301da9
Fix issue #245
mannggoo Nov 9, 2019
44c88a0
Update UG, add images to PPP
Nov 9, 2019
7587599
Merge branch 'master' into hema-ppp
Nov 9, 2019
fe9a04d
Update user guide
sianghwee Nov 9, 2019
1c30bc8
Reapply overwritten changes
Nov 9, 2019
737f1f1
Create and fix some test cases
sianghwee Nov 9, 2019
90868db
Fix code to make it neater
sianghwee Nov 9, 2019
9d62371
Fix issue with autoreschedule events not updating upon creation
mannggoo Nov 9, 2019
215ce19
Create command to mark a task as not done
sianghwee Nov 9, 2019
4a2a2ab
Refactor methods
sianghwee Nov 9, 2019
d2e4d52
Update to allow continue command
sianghwee Nov 9, 2019
225c2c9
Fix checkstyle
sianghwee Nov 9, 2019
c5c3f74
Fix test cases
sianghwee Nov 9, 2019
103fba8
Merge branch 'focus-mode-fix' of https://github.com/sianghwee/main in…
sianghwee Nov 9, 2019
839b465
Update UG
mannggoo Nov 9, 2019
6dbb104
Update user guide
sianghwee Nov 9, 2019
b0cbf1d
Merge pull request #267 from lrchema/hema-ppp
Icesiolz Nov 9, 2019
cccc694
Merge branch 'master' into master
Icesiolz Nov 9, 2019
eebd39f
Merge branch 'master' into focus-mode-fix
sianghwee Nov 9, 2019
649fa6d
Merge pull request #265 from Icesiolz/master
sianghwee Nov 9, 2019
f3909ef
Merge branch 'master' into focus-mode-fix
sianghwee Nov 9, 2019
deec316
Merge pull request #263 from sianghwee/focus-mode-fix
Icesiolz Nov 9, 2019
9eaeef2
Merge branch 'master' into fix-autoreschedule-reminder
Icesiolz Nov 9, 2019
d416af7
Update UG and DG
sianghwee Nov 9, 2019
28b22df
Fix merge conflict
sianghwee Nov 9, 2019
3f8414c
Merge branch 'master' into focus-mode-fix
sianghwee Nov 9, 2019
6534d14
Merge pull request #270 from sianghwee/focus-mode-fix
Icesiolz Nov 10, 2019
4acc9da
Merge branch 'master' into fix-autoreschedule-reminder
Icesiolz Nov 10, 2019
134c722
Update UserGuide.adoc
Icesiolz Nov 10, 2019
b23e50e
add snakegamehard.PNG
Icesiolz Nov 10, 2019
ab059eb
Update UserGuide.adoc
Icesiolz Nov 10, 2019
e9a75a5
Merge branch 'master' of https://github.com/Icesiolz/main
Icesiolz Nov 10, 2019
1ea79f2
Update UserGuide.adoc
Icesiolz Nov 10, 2019
d080972
Update UserGuide.adoc
Icesiolz Nov 10, 2019
f78fabd
Update UserGuide.adoc
Icesiolz Nov 10, 2019
0380455
Update UserGuide.adoc
Icesiolz Nov 10, 2019
f9d36cf
Update UserGuide.adoc
Icesiolz Nov 10, 2019
2a05ddf
Add uiclassdiagram
Icesiolz Nov 10, 2019
e0d65f7
Updated DG to include testing notes
sianghwee Nov 10, 2019
6321810
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
00d41be
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
38fa615
Merge branch 'master' into focus-mode-fix
sianghwee Nov 10, 2019
e0ffca0
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T10-3/ma…
sianghwee Nov 10, 2019
5b7f838
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
78729ab
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
5c97a7d
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
88fd3f3
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
7d12f7a
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
3e78fb8
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
062d73b
Add gameactivitydiagram
Icesiolz Nov 10, 2019
af92e36
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
bdf33b4
ItemBuilder invalidates autoreschedule & reminder
blimyj Nov 10, 2019
a392835
Fixx checkstyle error
blimyj Nov 10, 2019
4350f1e
add creategameseqdiagram
Icesiolz Nov 10, 2019
200a23f
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
ece4885
rename creatinggameseqdiagram
Icesiolz Nov 10, 2019
b648ab0
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
c03542b
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
6ecf600
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
bc1da04
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
df81445
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
0c693fa
Don't unsort when adding item
Nov 10, 2019
82b4c53
Update DeveloperGuide.adoc
Icesiolz Nov 10, 2019
fa51905
Update UserGuide.adoc
Icesiolz Nov 10, 2019
fb80d9b
Create icesiolz.adoc
Icesiolz Nov 10, 2019
35090d3
Fix checkstyle
Nov 10, 2019
ab1c75e
Merge pull request #271 from sianghwee/focus-mode-fix
lrchema Nov 10, 2019
caa291e
Merge branch 'master' into ban-autoreschdule-reminder
lrchema Nov 10, 2019
199d686
Merge pull request #272 from blimyj/ban-autoreschdule-reminder
lrchema Nov 10, 2019
5eb1e11
Update DG
mannggoo Nov 10, 2019
4695920
Merge branch 'fix-autoreschedule-reminder' of https://github.com/mann…
mannggoo Nov 10, 2019
aeb93c4
Merge branch 'master' into fix-autoreschedule-reminder
blimyj Nov 10, 2019
c2b0c1c
Fix --r breaking reminder
blimyj Nov 10, 2019
06db3e1
Add undo redo activity diagrams
Nov 10, 2019
256dd81
Merge branch 'master' into fix-edit-reminder
blimyj Nov 10, 2019
c818ceb
Merge branch 'master' into master
blimyj Nov 10, 2019
1fbb686
Merge pull request #273 from Icesiolz/master
blimyj Nov 10, 2019
0f2abc6
Fix snooze before reminder occurs
blimyj Nov 10, 2019
4c69d54
Merge branch 'master' into fix-edit-reminder
blimyj Nov 10, 2019
ffe40d0
Merge branch 'master' into fix-autoreschedule-reminder
blimyj Nov 10, 2019
85dbdff
Merge branch 'master' into sort-fix
blimyj Nov 10, 2019
19aad21
Merge branch 'master' into add-uml
blimyj Nov 10, 2019
f238a81
Merge pull request #274 from lrchema/sort-fix
blimyj Nov 10, 2019
fc5fdb7
Merge branch 'master' into fix-autoreschedule-reminder
blimyj Nov 10, 2019
e48a3de
Merge branch 'master' into fix-edit-reminder
blimyj Nov 10, 2019
e794270
Merge branch 'master' into add-uml
blimyj Nov 10, 2019
56b70d1
Merge pull request #276 from lrchema/add-uml
sianghwee Nov 10, 2019
89c0f55
Merge branch 'master' into fix-edit-reminder
sianghwee Nov 10, 2019
0d59af7
Merge branch 'master' into fix-autoreschedule-reminder
sianghwee Nov 10, 2019
d46d6ce
Edit snooze command description
blimyj Nov 10, 2019
d9523b4
Remove debugging code
blimyj Nov 10, 2019
b37f456
Merge branch 'fix-edit-reminder' of https://github.com/blimyj/main in…
blimyj Nov 10, 2019
551921f
Add appveyor badge & coveralls badge
blimyj Nov 10, 2019
07b3f42
Remove reminders in rescheduleTask
mannggoo Nov 11, 2019
28f80bc
Merge branch 'fix-autoreschedule-reminder' of https://github.com/mann…
mannggoo Nov 11, 2019
675a3b0
Update UG, DG, PPP
sianghwee Nov 11, 2019
ded2128
Fix typo
blimyj Nov 11, 2019
6f423f5
Fix bug with editing event with autoreschedule
mannggoo Nov 11, 2019
c6ce681
Fix checkstyle issues
mannggoo Nov 11, 2019
86ebb7c
Update icesiolz.adoc
Icesiolz Nov 11, 2019
fea9a5a
Refactor repeated code in AddCommand and add message usage for invali…
mannggoo Nov 11, 2019
ca19a3d
add ugimages
Icesiolz Nov 11, 2019
3db148e
Fix checkstyle issues
mannggoo Nov 11, 2019
ca68d7f
Update icesiolz.adoc
Icesiolz Nov 11, 2019
a20d489
Update icesiolz.adoc
Icesiolz Nov 11, 2019
b543073
Merge pull request #266 from mannggoo/fix-autoreschedule-reminder
sianghwee Nov 11, 2019
7863d5d
Merge branch 'master' into fix-edit-reminder
sianghwee Nov 11, 2019
dc09b46
Update icesiolz.adoc
Icesiolz Nov 11, 2019
f5fb4d0
add ugss
Icesiolz Nov 11, 2019
6e6b960
Update icesiolz.adoc
Icesiolz Nov 11, 2019
b528fd1
Minor edit to UG
blimyj Nov 11, 2019
ac3b418
Merge branch 'master' into new-ug-dg
blimyj Nov 11, 2019
0cd85ff
Update icesiolz.adoc
Icesiolz Nov 11, 2019
6c39f2f
add DG screenshots
Icesiolz Nov 11, 2019
2b8d448
Merge branch 'master' into master
Icesiolz Nov 11, 2019
a2e687d
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T10-3/main
Icesiolz Nov 11, 2019
f337340
Merge branch 'master' of https://github.com/Icesiolz/main
Icesiolz Nov 11, 2019
2822b82
Update DeveloperGuide.adoc
Icesiolz Nov 11, 2019
d0dd5c6
Update DeveloperGuide.adoc
Icesiolz Nov 11, 2019
e06f670
Update DeveloperGuide.adoc
Icesiolz Nov 11, 2019
f79f8f4
Update DeveloperGuide.adoc
Icesiolz Nov 11, 2019
69f0623
Update DeveloperGuide.adoc
Icesiolz Nov 11, 2019
2b1792a
Update icesiolz.adoc
Icesiolz Nov 11, 2019
810b5c2
Update icesiolz.adoc
Icesiolz Nov 11, 2019
cc2a14b
Update icesiolz.adoc
Icesiolz Nov 11, 2019
f41f2f7
Update testing manual
sianghwee Nov 11, 2019
ceb9a33
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T10-3/ma…
sianghwee Nov 11, 2019
c8ee093
Finish blimyj UG
blimyj Nov 11, 2019
b78f7bb
Edit Testing.adoc"
blimyj Nov 11, 2019
1de3c75
Edit DevOps.adoc
blimyj Nov 11, 2019
da62abc
Merge pull request #277 from Icesiolz/master
lrchema Nov 11, 2019
1694bac
Merge branch 'master' into fix-edit-reminder
Icesiolz Nov 11, 2019
464a973
Merge pull request #275 from blimyj/fix-edit-reminder
Icesiolz Nov 11, 2019
7002611
Add snooze use case
blimyj Nov 11, 2019
4754558
Update manual testing section for reminder
blimyj Nov 11, 2019
363dfd6
Fix merge conflicts
blimyj Nov 11, 2019
2eedddc
Add Manual Testing for Reminder & Snoozing
blimyj Nov 11, 2019
f5fedea
Improve test coverage
sianghwee Nov 11, 2019
14975df
Merge branch 'master' into focus-mode-fix
sianghwee Nov 11, 2019
c4c1907
Fix checkstyle
sianghwee Nov 11, 2019
c69e601
Merge branch 'focus-mode-fix' of https://github.com/sianghwee/main in…
sianghwee Nov 11, 2019
8bc5dd0
Update DG with testing notes and statewise undo
Nov 11, 2019
f48ae2e
Merge branch 'master' into undo-test-notes
lrchema Nov 11, 2019
2c8905a
Resize diagrams
Nov 11, 2019
fcd28e1
Merge branch 'undo-test-notes' of https://github.com/lrchema/main int…
Nov 11, 2019
fbeb954
Delete UndoCommandTest.java
lrchema Nov 11, 2019
909c54d
Edit PPP
Nov 11, 2019
b8d3134
Edit to PPP
blimyj Nov 11, 2019
61ec858
Add UG to PPP
blimyj Nov 11, 2019
3c45108
Fix checkstyle violation
blimyj Nov 11, 2019
65ce3c4
Update AboutUs.adoc
Icesiolz Nov 11, 2019
949d2b3
Merge pull request #278 from sianghwee/focus-mode-fix
Icesiolz Nov 11, 2019
b7174d0
Merge branch 'master' into master
Icesiolz Nov 11, 2019
8efe358
Merge branch 'master' into undo-test-notes
lrchema Nov 11, 2019
297f49f
Edit PPP
blimyj Nov 11, 2019
7ed90f5
Fix merge conflict
blimyj Nov 11, 2019
4cf491f
Add tests for undo and redo
Nov 11, 2019
4552737
Merge pull request #279 from lrchema/undo-test-notes
blimyj Nov 11, 2019
afb6d47
Merge branch 'master' into master
Icesiolz Nov 11, 2019
acb3438
Merge branch 'master' into test-cases
lrchema Nov 11, 2019
802e537
Fix merge conflict
blimyj Nov 11, 2019
3fcec93
Merge pull request #282 from Icesiolz/master
blimyj Nov 11, 2019
4e575e5
Merge branch 'master' into test-cases
blimyj Nov 11, 2019
00c5d53
Merge branch 'master' into new-ug-dg
blimyj Nov 11, 2019
31f1628
Merge branch 'master' into ppp-edits
blimyj Nov 11, 2019
68c278c
Update ppp
mannggoo Nov 11, 2019
d295ef4
Update PPP
mannggoo Nov 11, 2019
2434b93
Update UG Legend
mannggoo Nov 11, 2019
8923020
Reduce content in PPP
mannggoo Nov 11, 2019
658c045
Edit portfolio link in AboutUs
mannggoo Nov 11, 2019
926b424
Update PPP
mannggoo Nov 11, 2019
74356c3
Update PPP
mannggoo Nov 11, 2019
8c0bd9b
Edit AboutUs.adoc
blimyj Nov 11, 2019
803c6ae
Merge branch 'master' into ppp-edits
blimyj Nov 11, 2019
a5920e8
Merge branch 'master' into Update-PPP
Icesiolz Nov 11, 2019
adebc1b
Merge pull request #284 from lrchema/test-cases
blimyj Nov 11, 2019
daa419b
Merge branch 'master' into Update-PPP
blimyj Nov 11, 2019
3640b95
Merge branch 'master' into new-ug-dg
blimyj Nov 11, 2019
48c245a
Merge branch 'ppp-edits' of https://github.com/blimyj/main into ppp-e…
blimyj Nov 11, 2019
48decf0
Update test cases
sianghwee Nov 11, 2019
56dc8b4
Update user guide
sianghwee Nov 11, 2019
26792c6
Update PPP
mannggoo Nov 11, 2019
87fd035
Merge branch 'Update-PPP' of https://github.com/mannggoo/main into Up…
mannggoo Nov 11, 2019
434ec4a
Merge branch 'master' into focus-mode-fix
sianghwee Nov 11, 2019
a0e137d
Fix some issues in PPP
sianghwee Nov 11, 2019
eb488d7
Update PPP
mannggoo Nov 11, 2019
677d24f
Fix some issues with the PPP
sianghwee Nov 11, 2019
ca1a4e1
Merge branch 'focus-mode-fix' of https://github.com/sianghwee/main in…
sianghwee Nov 11, 2019
9af12f3
Add commons portion of PPP
blimyj Nov 11, 2019
4dc6953
Fix checkstyle violation
blimyj Nov 11, 2019
c405512
Merge branch 'master' into ppp-edits
blimyj Nov 11, 2019
d8101a2
Merge pull request #280 from mannggoo/Update-PPP
Icesiolz Nov 11, 2019
d4ea0af
Merge branch 'master' into focus-mode-fix
sianghwee Nov 11, 2019
d4b8a03
Merge pull request #285 from sianghwee/focus-mode-fix
lrchema Nov 11, 2019
076aa2a
Merge branch 'master' into new-ug-dg
blimyj Nov 11, 2019
1fb9550
Merge pull request #281 from blimyj/new-ug-dg
lrchema Nov 11, 2019
3154a7d
Finish DG
blimyj Nov 11, 2019
a154d84
Merge branch 'ppp-edits' of https://github.com/blimyj/main into ppp-e…
blimyj Nov 11, 2019
a7d1f9f
Merge branch 'master' into ppp-edits
blimyj Nov 11, 2019
613c6ea
Merge pull request #283 from blimyj/ppp-edits
sianghwee Nov 11, 2019
cf6fd97
Create parser test
sianghwee Nov 11, 2019
7ff733a
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T10-3/ma…
sianghwee Nov 11, 2019
970064f
Merge pull request #286 from sianghwee/focus-mode-fix
lrchema Nov 11, 2019
5cb8f7b
Fix PNG issues
sianghwee Nov 11, 2019
de9a3b3
Change PPP
blimyj Nov 11, 2019
ccc4552
Merge branch 'master' into focus-mode-fix
sianghwee Nov 11, 2019
43ec2fd
Merge pull request #288 from blimyj/edit-ppp-2
sianghwee Nov 11, 2019
2977dd6
Merge branch 'master' into focus-mode-fix
sianghwee Nov 11, 2019
3c6ba82
Merge pull request #287 from sianghwee/focus-mode-fix
sianghwee Nov 11, 2019
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ src/main/resources/docs/
/*.iml

# Storage/log files
/data/
/data/*.json
/config.json
/preferences.json
/*.log.*
Expand Down
15 changes: 8 additions & 7 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
= Address Book (Level 3)
= ELISA
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&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]]
https://travis-ci.org/AY1920S1-CS2103T-T10-3/main[image:https://travis-ci.org/AY1920S1-CS2103T-T10-3/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/blimyj/main/branch/master[image:https://ci.appveyor.com/api/projects/status/o281h6kwxi79gf2u/branch/master?svg=true[Build status]]
https://coveralls.io/github/AY1920S1-CS2103T-T10-3/main[image:https://coveralls.io/repos/github/AY1920S1-CS2103T-T10-3/main/badge.svg[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,9 +13,11 @@ 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).
* Extremely Loud and Intelligent Student Assistant (ELISA) is for students who *want to have an intelligent companion that keeps track of tasks and give friendly reminders on when to take breaks*.
* More importantly, ELISA is *optimized for those who prefer to work with a Command Line Interface* (CLI) while still having the benefits of a Graphical User Interface (GUI). If you can type fast, ELISA can get your tasks done faster than traditional GUI apps.
* 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.
* Interested? Jump to the <<Quick Start>> to get started. Enjoy!

== Site Map

Expand All @@ -29,6 +29,7 @@ endif::[]

== Acknowledgements

* Built on AddressBook-Level3 project created by SE-EDU initiative at https://se-education.org
* 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://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
Expand Down
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.Main'
mainClassName = 'seedu.elisa.Main'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
Expand Down Expand Up @@ -43,7 +43,7 @@ test {

dependencies {
String jUnitVersion = '5.4.0'
String javaFxVersion = '11'
String javaFxVersion = '11.0.1'

implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
Expand All @@ -57,6 +57,9 @@ dependencies {
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'linux'

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
Expand All @@ -67,7 +70,7 @@ dependencies {
}

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

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

AddressBook - Level 3 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.}_ +
ELISA _(Exceptionally Loud and Intelligent Student Assistant)_ - Was developed by the https://github.com/AY1920S1-CS2103T-T10-3[T10-3] team. +
ELISA is a student assistant made for college students who need constant reminders to complete their daily tasks. More importantly, ELISA is optimized for those who prefer to work with a Command Line Interface (CLI) while still having the benefits of a Graphical User Interface (GUI). +
{empty} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
We are a student 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>>]
=== Bryan Lim
image::blimyj.png[width="150", align="left"]
{empty}[http://github.com/blimyj[github]] [<<blimyj#, portfolio>>]

Role: Project Advisor
Role: Developer +
Responsibilities: Commons. Management of issue tracker, team repo and team.

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Functionality

'''

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

Role: Developer +
Responsibilities: Data
Responsibilities: Logic

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: UI

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Model

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

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2103T-T10-3/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`
* *Email us* : You can also reach us at `holmescordelia8 [at] gmail.com`

8 changes: 4 additions & 4 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= ELISA - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand All @@ -12,7 +12,7 @@ ifdef::env-github[]
:note-caption: :information_source:
:warning-caption: :warning:
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level3/tree/master
:repoURL: https://github.com/AY1920S1-CS2103T-T10-3/main

== Build Automation

Expand All @@ -34,14 +34,14 @@ When a pull request has changes to asciidoc files, you can use https://www.netli

Here are the steps to create a new release.

. Update the version number in link:{repoURL}/src/main/java/seedu/address/MainApp.java[`MainApp.java`].
. Update the version number in link:{repoURL}/main/blob/master/src/main/java/seedu/elisa/MainApp.java[`MainApp.java`].
. Generate a JAR file <<UsingGradle#creating-the-jar-file, using Gradle>>.
. Tag the repo with the version number. e.g. `v0.1`
. https://help.github.com/articles/creating-releases/[Create a new release using GitHub] and upload the JAR file you created.

== Managing Dependencies

A project often depends on third-party libraries. For example, Address Book depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:
A project often depends on third-party libraries. For example, ELISA depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:

[loweralpha]
. Include those libraries in the repo (this bloats the repo size)
Expand Down
Loading