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

[F11-4] NUS Hangs #115

Open
wants to merge 961 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
961 commits
Select commit Hold shift + click to select a range
f15d9bc
update userguide
aspiringdevslog Nov 10, 2018
1d7636b
update userguide
aspiringdevslog Nov 10, 2018
0aa99bb
update userguide
aspiringdevslog Nov 10, 2018
221bade
update ppp
Nov 10, 2018
0e23985
Merge branch 'v1.4' of https://github.com/aspiringdevslog/main into v1.4
Nov 10, 2018
75776d7
tag test
aspiringdevslog Nov 10, 2018
7a83e14
testing asciidocs include
aspiringdevslog Nov 10, 2018
aecd160
test
aspiringdevslog Nov 10, 2018
dce616d
update tags
aspiringdevslog Nov 10, 2018
ac305cb
Merge branch 'master' into master
Happytreat Nov 10, 2018
19e5fe1
Merge pull request #214 from souless94/master
Happytreat Nov 10, 2018
4875d2a
Merge branch 'master' into v1.4
aspiringdevslog Nov 10, 2018
5f0b5c0
Edit DeleteGroupCommand SD
Happytreat Nov 10, 2018
23b58c5
Fix merge conflict
Happytreat Nov 10, 2018
955bfd9
Merge pull request #215 from aspiringdevslog/v1.4
aspiringdevslog Nov 10, 2018
3f41d9e
Merge pull request #217 from Happytreat/v1.3
aspiringdevslog Nov 10, 2018
7b2594d
update docs
Nov 10, 2018
80ffcf7
Remove setGroups and created Defensive and immutable Person class
Happytreat Nov 10, 2018
3b8c1c3
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/mai…
Happytreat Nov 10, 2018
939d0de
Merge branch 'v1.4' of https://github.com/aspiringdevslog/main into v1.4
Nov 10, 2018
cdb3720
Edit PersonTest to include new defensiveSetGroups() function
Happytreat Nov 10, 2018
d6d44f5
update tags
Nov 10, 2018
7e3475f
Add test for defensiveSetGroups in PersonTest
Happytreat Nov 10, 2018
df9d7a1
Merge pull request #218 from aspiringdevslog/v1.4
aspiringdevslog Nov 10, 2018
8a58f95
Fix Create bug in AddressBookParser
Happytreat Nov 10, 2018
e08d987
Refactor the addMemberFromGroup method
Happytreat Nov 10, 2018
2c1a715
update tags
Nov 10, 2018
203e6fd
Merge pull request #219 from aspiringdevslog/v1.4
aspiringdevslog Nov 10, 2018
b54c2db
Add RegisterCommandTest
Happytreat Nov 10, 2018
e65fd13
Developer Guide: Update FindCommand Sequence Diagram
ZhiWei94 Nov 10, 2018
cde862b
fix end tag error
Nov 10, 2018
0b7cbf8
DG: update size
ZhiWei94 Nov 10, 2018
5720439
DG: Update FindSequence.png
ZhiWei94 Nov 10, 2018
d9f6e19
Merge pull request #220 from aspiringdevslog/v1.4
aspiringdevslog Nov 10, 2018
5681810
DG: Change picture and size
ZhiWei94 Nov 10, 2018
763142d
Refactor deleteMemberFromGroup Method
Happytreat Nov 10, 2018
990d5ca
Add DeleteMemberCommandTest
Happytreat Nov 10, 2018
5c8de1f
Merge pull request #221 from ZhiWei94/master
Happytreat Nov 10, 2018
7af834c
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/mai…
Happytreat Nov 10, 2018
64b250d
Merge pull request #222 from Happytreat/v1.3
Happytreat Nov 10, 2018
16bd04f
Update happytreat.adoc
Happytreat Nov 10, 2018
baa2ec1
Update happytreat.adoc
Happytreat Nov 10, 2018
6cb1615
Merge pull request #223 from Happytreat/v1.3
Happytreat Nov 10, 2018
1ea1c72
Update DeveloperGuide.adoc
Happytreat Nov 10, 2018
73a3d83
DeveloperGuide: Update Activity Diagram for FindCommand
ZhiWei94 Nov 10, 2018
e41940d
DeveloperGuide: Update Activity Diagram for FindCommand
ZhiWei94 Nov 10, 2018
70c85b2
DeveloperGuide: Change image for FindCommand
ZhiWei94 Nov 10, 2018
1768206
DeveloperGuide: update image for FindCommand
ZhiWei94 Nov 10, 2018
a1cf442
update docs
Nov 10, 2018
e99c55b
update ppp
Nov 10, 2018
94ac2a1
update docs
Nov 10, 2018
ac10ea9
fix checkstyle
Nov 10, 2018
1c96b81
fix trailing whitespace
Nov 10, 2018
8df39ff
fix trailing whitespace
Nov 11, 2018
ae3d428
update logs
Nov 11, 2018
9403cf2
remove unused code
Nov 11, 2018
8fdce83
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/mai…
Nov 11, 2018
2b50ff0
fix trailing white space
Nov 11, 2018
dadab93
remove trailing whitespace
aspiringdevslog Nov 11, 2018
eb3e9be
fix checkstyle
Nov 11, 2018
084cb11
fix checkstyle
Nov 11, 2018
a37dd74
Merge pull request #225 from aspiringdevslog/v1.4
aspiringdevslog Nov 11, 2018
12cca5d
update developer guide
aspiringdevslog Nov 11, 2018
bfe00c4
fix typo in the diagram
souless94 Nov 11, 2018
bf1c644
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
souless94 Nov 11, 2018
7bebe45
DG update
ZhiWei94 Nov 11, 2018
43846fb
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
ZhiWei94 Nov 11, 2018
165e9bd
fix bug for editTimetable Parser
souless94 Nov 11, 2018
1e14858
update developer guide
souless94 Nov 11, 2018
9a6238b
Merge pull request #224 from ZhiWei94/master
ZhiWei94 Nov 11, 2018
4fa49c7
update user guide
souless94 Nov 11, 2018
1abfe44
fix code style error
souless94 Nov 11, 2018
3a8f6ba
update PPP
aspiringdevslog Nov 11, 2018
46c5738
fix typos
souless94 Nov 11, 2018
a681ba2
fix code style error
souless94 Nov 11, 2018
9fe862f
update addTimetableCommand to show the timetable location the app is …
souless94 Nov 11, 2018
f4c267a
Change 'address book' to 'NUS Hangs' in crucial messages
ZhiWei94 Nov 11, 2018
5a4035f
DG: update DG
ZhiWei94 Nov 11, 2018
f2e1994
DG: Update DG
ZhiWei94 Nov 11, 2018
9fc7b3d
DG: Update DG
ZhiWei94 Nov 11, 2018
d4ce449
UG: Update UG
ZhiWei94 Nov 11, 2018
bdd7703
Merge pull request #227 from ZhiWei94/master
Happytreat Nov 11, 2018
9d74549
Merge branch 'master' into master
Happytreat Nov 11, 2018
aa8823c
Merge pull request #226 from souless94/master
Happytreat Nov 11, 2018
0477156
Update happytreat.adoc
Happytreat Nov 11, 2018
995a412
Update UserGuide.adoc
Happytreat Nov 11, 2018
bc61512
zhiwei94.adoc: Update aboutMe for PPP
ZhiWei94 Nov 11, 2018
25814ec
zhiwei94.adoc: update typo
ZhiWei94 Nov 11, 2018
fa26ff7
zhiwei94.adoc: fix style
ZhiWei94 Nov 11, 2018
33fbba8
Merge pull request #228 from ZhiWei94/master
ZhiWei94 Nov 11, 2018
b47ae94
zhiwei94.adoc: fix typo
ZhiWei94 Nov 11, 2018
635f594
zhiwei94.adoc: update style
ZhiWei94 Nov 11, 2018
b6300ba
Update happytreat.adoc
Happytreat Nov 11, 2018
1a4889e
reposense and authorship/contributions
nigelngyy Nov 11, 2018
1b2b7ab
update security portion of the user guide
aspiringdevslog Nov 12, 2018
3328dad
update tags for PPP
aspiringdevslog Nov 12, 2018
d3294b6
update aspiringdevslog.adoc
aspiringdevslog Nov 12, 2018
921b02f
fix formatting issues in security portion
aspiringdevslog Nov 12, 2018
b843a41
fix PR link
aspiringdevslog Nov 12, 2018
0baef26
fix trailing white space
aspiringdevslog Nov 12, 2018
52eed85
FindCommandParser: refractor metthod
ZhiWei94 Nov 12, 2018
5aab025
Update UserGuide.adoc
Happytreat Nov 12, 2018
4c131b0
Update happytreat.adoc
Happytreat Nov 12, 2018
a856683
Update happytreat.adoc
Happytreat Nov 12, 2018
84d78f9
Update UserGuide.adoc
Happytreat Nov 12, 2018
798e1e5
Update UserGuide.adoc
Happytreat Nov 12, 2018
e1f637a
add tag for developer guide
souless94 Nov 12, 2018
427796c
Merge pull request #229 from souless94/master
Happytreat Nov 12, 2018
c829ec2
added tests and more error messages
nigelngyy Nov 12, 2018
c7afdb1
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/mai…
nigelngyy Nov 12, 2018
e6fc84e
fix bug for reading timetable from xmlfile.
souless94 Nov 12, 2018
f988f63
fix typos in developer guide
souless94 Nov 12, 2018
eb9b03a
fix typo in Developer guide
souless94 Nov 12, 2018
362e447
fix typo for timetableData
souless94 Nov 12, 2018
232f1d7
typo in timetableData
souless94 Nov 12, 2018
e2a537a
edited userguide and test files
nigelngyy Nov 12, 2018
aba2e74
reposense
nigelngyy Nov 12, 2018
865e84e
style check
nigelngyy Nov 12, 2018
c8bae85
style check
nigelngyy Nov 12, 2018
7a16bc0
fix timetableDataTest having wrong test case
souless94 Nov 12, 2018
8e8bfbc
edit comments for the test
souless94 Nov 12, 2018
9783dd0
edit comments for the test case
souless94 Nov 12, 2018
c75029c
test
nigelngyy Nov 12, 2018
31531a8
fix bug in timetableData
souless94 Nov 12, 2018
26c544b
travis build / codacy
nigelngyy Nov 12, 2018
f40738d
update developer guide
souless94 Nov 12, 2018
a8ebb53
update DG
souless94 Nov 12, 2018
f889d5e
update user guide to have a standard timezone
souless94 Nov 12, 2018
7e6bb07
travis
nigelngyy Nov 12, 2018
ade0003
travis
nigelngyy Nov 12, 2018
52583a8
update user guide
souless94 Nov 12, 2018
92396e1
fix typo in user guide
souless94 Nov 12, 2018
5a69f2c
update user guide
souless94 Nov 12, 2018
6a7be6b
fix typos
souless94 Nov 12, 2018
080b8de
Find/Add Command: Add Test, Update DG
ZhiWei94 Nov 12, 2018
49fe2c1
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
ZhiWei94 Nov 12, 2018
68234fd
DG: update typo
ZhiWei94 Nov 12, 2018
daf5f90
Merge pull request #230 from souless94/master
Happytreat Nov 12, 2018
526c65e
created more test samples
souless94 Nov 12, 2018
b97323b
update image for DG
souless94 Nov 12, 2018
89c0422
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
souless94 Nov 12, 2018
10eb1c0
update user guide
souless94 Nov 12, 2018
2a76127
update user guide
souless94 Nov 12, 2018
4a1d516
travis check
nigelngyy Nov 12, 2018
880ad5b
travis
nigelngyy Nov 12, 2018
e214629
update developer guide
souless94 Nov 12, 2018
f9671c7
adjust size for the image
souless94 Nov 12, 2018
b47774d
travis
nigelngyy Nov 12, 2018
e06d284
Merge pull request #233 from souless94/master
Happytreat Nov 12, 2018
2b288a9
travis
nigelngyy Nov 12, 2018
a327b9a
fix create command issue
Nov 12, 2018
acc0288
DG&UG: Add tag
ZhiWei94 Nov 12, 2018
0f50cc8
update user guide
souless94 Nov 12, 2018
a458dd0
FindCommand: Fix Codacy
ZhiWei94 Nov 12, 2018
cb80e54
fix checkstyle
Nov 12, 2018
6f0df45
UG: fix typo
ZhiWei94 Nov 12, 2018
7c4b750
DG: Fix typo
ZhiWei94 Nov 12, 2018
54a0327
DG: Fix Typo
ZhiWei94 Nov 12, 2018
723381c
update user guide
souless94 Nov 12, 2018
cc9e71c
Merge pull request #234 from aspiringdevslog/final
Happytreat Nov 12, 2018
75564f5
Merge pull request #235 from souless94/master
Happytreat Nov 12, 2018
065e924
Merge pull request #232 from ZhiWei94/master
ZhiWei94 Nov 12, 2018
b034eb6
Rename zhiwei94.adoc to ZhiWei94.adoc
ZhiWei94 Nov 12, 2018
b53a167
update message for create command
Nov 12, 2018
59819f6
Add shorthands to command before login
Happytreat Nov 12, 2018
9ab9599
DG&UG: Update tag
ZhiWei94 Nov 12, 2018
b76fb4b
test coverage
nigelngyy Nov 12, 2018
034268b
TEST COVERAGE
nigelngyy Nov 12, 2018
146511f
Merge pull request #238 from ZhiWei94/master
ZhiWei94 Nov 12, 2018
406dd49
fix trailing white space
Nov 12, 2018
87e0f8f
fix trailing whitespace
Nov 12, 2018
86416f7
test coverage
nigelngyy Nov 12, 2018
9238a1c
update userguide
Nov 12, 2018
ba25742
Merge pull request #237 from Happytreat/v1.3
souless94 Nov 12, 2018
8416c08
Merge pull request #236 from aspiringdevslog/final
aspiringdevslog Nov 12, 2018
50be754
fix typo
aspiringdevslog Nov 12, 2018
9f7735f
UG
nigelngyy Nov 12, 2018
93e485c
fix developer guide format errors
Nov 12, 2018
1248a0f
Merge branch 'master' into new
nigelngyy Nov 12, 2018
e97ca86
fix developer guide format error [security mechanism section]
Nov 12, 2018
ba29839
Merge pull request #231 from nigelngyy/new
nigelngyy Nov 12, 2018
245182e
fix typo
Nov 12, 2018
13bed5a
Merge pull request #240 from aspiringdevslog/final
aspiringdevslog Nov 12, 2018
69d2bdc
update DG
souless94 Nov 12, 2018
49be7c4
resolve developer guide conflict
souless94 Nov 12, 2018
267f4ba
Merge pull request #241 from souless94/master
souless94 Nov 12, 2018
31f6716
zhiwei.adoc: update PPP
ZhiWei94 Nov 12, 2018
82c8559
Merge pull request #242 from ZhiWei94/master
ZhiWei94 Nov 12, 2018
6eb8c1c
update PPP
souless94 Nov 12, 2018
4d7f79a
update Ui
souless94 Nov 12, 2018
a7028a3
fix typo in test
souless94 Nov 12, 2018
5ef6288
fix typo in user guide
souless94 Nov 12, 2018
2382539
Merge pull request #243 from souless94/master
souless94 Nov 12, 2018
9601dc7
update image of Ui
souless94 Nov 12, 2018
5291e74
update name of jar file
souless94 Nov 12, 2018
19e4201
fix typo
souless94 Nov 12, 2018
7ae3b64
add author for ZhiWei94
ZhiWei94 Nov 12, 2018
7332bd2
Merge pull request #244 from souless94/master
souless94 Nov 12, 2018
cc08126
Merge pull request #245 from ZhiWei94/master
Happytreat Nov 12, 2018
0e86fcb
Rename ZhiWei94.adoc to zhiwei94.adoc
ZhiWei94 Nov 12, 2018
be54cea
Update UserGuide.adoc
Happytreat Nov 12, 2018
7c4118e
Update UserGuide.adoc
Happytreat Nov 12, 2018
2ca9286
fix typo in UG
souless94 Nov 12, 2018
48199d9
Update DeveloperGuide.adoc
Happytreat Nov 12, 2018
ed04b4b
Update UserGuide.adoc
aspiringdevslog Nov 12, 2018
75c79a3
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
souless94 Nov 12, 2018
108cf3a
Update AddressBookParser.java
Happytreat Nov 12, 2018
f1ba094
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
souless94 Nov 12, 2018
6937c47
Fix missing find command alias
Happytreat Nov 12, 2018
41d4fef
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/mai…
Happytreat Nov 12, 2018
000d497
Update UserGuide.adoc
Happytreat Nov 12, 2018
dcefda1
update DG
souless94 Nov 12, 2018
8d933d0
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
souless94 Nov 12, 2018
91a0898
Merge pull request #247 from CS2103-AY1819S1-F11-4/update-userguide
Happytreat Nov 12, 2018
1745b85
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
souless94 Nov 12, 2018
078912d
Merge pull request #246 from souless94/master
souless94 Nov 12, 2018
fc2c428
Update ViewGroupCommand.java
Happytreat Nov 12, 2018
12b0b20
Update RegisterCommand.java
Happytreat Nov 12, 2018
841ab80
Update DeleteMemberCommand.java
Happytreat Nov 12, 2018
c750c90
Update EditGroupCommand.java
Happytreat Nov 12, 2018
b79b89a
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/mai…
Happytreat Nov 12, 2018
122d61a
DeveloperGuide: Update DG
ZhiWei94 Nov 12, 2018
4ee4f4e
Fix command usages
Happytreat Nov 12, 2018
b982a69
Merge branch 'master' of https://github.com/CS2103-AY1819S1-F11-4/main
ZhiWei94 Nov 12, 2018
b048471
AboutUs.adoc: change 'ZhiWei94' to lower case 'zhiwei94' as per requi…
ZhiWei94 Nov 12, 2018
0ac62a8
Edit PPP, UG and command usage
Happytreat Nov 12, 2018
cbdb0a5
Merge pull request #249 from ZhiWei94/master
Happytreat Nov 12, 2018
596db82
Merge pull request #248 from Happytreat/v1.3
Happytreat Nov 12, 2018
d6977d1
UML diagrams and dg updates
nigelngyy Nov 12, 2018
d9a160d
PPP
nigelngyy Nov 12, 2018
e380f12
DG: Update person feature
ZhiWei94 Nov 12, 2018
7d2cc30
STYLE FOR TRAVIS
nigelngyy Nov 12, 2018
6dd3fe5
DG: Update person feature
ZhiWei94 Nov 12, 2018
6726a35
DG: update person feature
ZhiWei94 Nov 12, 2018
a92d372
Merge pull request #250 from nigelngyy/new
nigelngyy Nov 12, 2018
9d8febb
Merge pull request #251 from ZhiWei94/master
ZhiWei94 Nov 12, 2018
778d01e
UG, DG and PPP
nigelngyy Nov 12, 2018
dd0f516
Merge pull request #252 from nigelngyy/new
nigelngyy Nov 12, 2018
eef1e2d
dg
nigelngyy Nov 12, 2018
a96eeb5
Merge pull request #253 from nigelngyy/new
nigelngyy Nov 12, 2018
4ff1c09
dg
nigelngyy Nov 12, 2018
c15eb50
Merge pull request #254 from nigelngyy/new
nigelngyy Nov 12, 2018
f751356
Update UserGuide.adoc
Happytreat Nov 12, 2018
86ac20b
Update DeveloperGuide.adoc
Happytreat Nov 12, 2018
44c9240
Update UserGuide.adoc
Happytreat Nov 12, 2018
b81612f
Update DeveloperGuide.adoc
Happytreat Nov 12, 2018
18b409c
author tags
nigelngyy Nov 13, 2018
36d09f4
Revert "author tags"
nigelngyy Nov 14, 2018
854b32b
config json
nigelngyy Nov 14, 2018
dd3961a
Merge pull request #255 from nigelngyy/new
nigelngyy Nov 15, 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
Empty file added .attach_pid11612
Empty file.
Empty file added .attach_pid13578
Empty file.
Empty file added .attach_pid13939
Empty file.
Empty file added .attach_pid14297
Empty file.
Empty file added .attach_pid14432
Empty file.
Empty file added .attach_pid14563
Empty file.
Empty file added .attach_pid15052
Empty file.
Empty file added .attach_pid15068
Empty file.
Empty file added .attach_pid15103
Empty file.
Empty file added .attach_pid15378
Empty file.
Empty file added .attach_pid15753
Empty file.
Empty file added .attach_pid15834
Empty file.
Empty file added .attach_pid15964
Empty file.
Empty file added .attach_pid16082
Empty file.
Empty file added .attach_pid16263
Empty file.
Empty file added .attach_pid16793
Empty file.
Empty file added .attach_pid16872
Empty file.
Empty file added .attach_pid17024
Empty file.
Empty file added .attach_pid17087
Empty file.
Empty file added .attach_pid17170
Empty file.
Empty file added .attach_pid17256
Empty file.
Empty file added .attach_pid17338
Empty file.
Empty file added .attach_pid17615
Empty file.
Empty file added .attach_pid23512
Empty file.
Empty file added .attach_pid25016
Empty file.
Empty file added .attach_pid25951
Empty file.
Empty file added .attach_pid26030
Empty file.
Empty file added .attach_pid26888
Empty file.
Empty file added .attach_pid26967
Empty file.
Empty file added .attach_pid27073
Empty file.
Empty file added .attach_pid27219
Empty file.
Empty file added .attach_pid27359
Empty file.
Empty file added .attach_pid7448
Empty file.
Empty file added .attach_pid9405
Empty file.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lib/*
*.log
*.log.*
*.csv
config.json
/config.json
src/test/data/sandbox/
preferences.json
.DS_Store
Expand All @@ -18,3 +18,4 @@ classes/
/bin/
src/main/resources/docs/
out/
src/test/data/sandboxmanyPersons.xml
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:

script: >-
./config/travis/run-checks.sh &&
travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage
travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyTimetablePage

deploy:
skip_cleanup: true
Expand Down
23 changes: 11 additions & 12 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
= Address Book (Level 4)
= Nus Hangs

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]]
https://travis-ci.org/CS2103-AY1819S1-F11-4/main[image:https://travis-ci.org/CS2103-AY1819S1-F11-4/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/CS2103-AY1819S1-F11-4/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-F11-4/main/badge.svg?branch=master[Coverage Status]]
image:https://api.codacy.com/project/badge/Grade/ad9658a1eccc44ffb117fb932e9be66b[link="https://app.codacy.com/app/Happytreat/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103-AY1819S1-F11-4/main&utm_campaign=Badge_Grade_Dashboard"]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

ifdef::env-github[]
Expand All @@ -15,26 +15,25 @@ 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.
* This is a desktop Schedule Manager application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java application written by developers of F11-4, to target small to mid-size study/interest groups in NUS.
* What's different from https://github.com/se-edu/addressbook-level4[Address Book level 4]:
** More specific functions added
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.

== Site Map

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

== 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_.
* "NUS Hangs" is a morph product from Address Book 4 and all credits goes to its developers at https://github.com/se-edu/[se-edu].
* 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]
* Done by team F11-4

== Licence : link:LICENSE[MIT]
30 changes: 30 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"authors":
[
{
"githubId": "souless94",
"displayName": "CHIA ...N KAI",
"authorNames": ["souless94"]
},
{
"githubId": "nigelngyy",
"displayName": "NG YU...NIGEL",
"authorNames": ["nigelngyy", "HIGHMETABOLISM\\User"]
},
{
"githubId": "Happytreat",
"displayName": "SIM M...ODIES",
"authorNames": ["Happytreat"]
},
{
"githubId": "ZhiWei94",
"displayName": "TAN Z...I WEI",
"authorNames": ["ZhiWei94"]
},
{
"githubId": "aspiringdevslog",
"displayName": "TANG ...ESLIE",
"authorNames": ["aspiringdevslog"]
}
]
}
15 changes: 10 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ dependencies {
implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'
implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
implementation group: 'javax.activation', name: 'activation', version: '1.1.1'
implementation group: 'com.opencsv', name: 'opencsv' ,version: '4.3.2'
implementation group: 'org.jsoup', name: 'jsoup' ,version: '1.11.3'
implementation group: 'commons-io', name: 'commons-io', version: '2.6'

testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.testfx', name: 'testfx-core', version: testFxVersion, {
Expand All @@ -82,7 +85,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'nus Hangs.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -207,8 +210,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-name': 'NUS Hangs',
'site-githuburl': 'https://github.com/CS2103-AY1819S1-F11-4/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down Expand Up @@ -236,11 +239,13 @@ task deployOfflineDocs(type: Copy) {
}
}

task copyDummySearchPage(type: Copy) {
from 'docs/DummySearchPage.html'
task copyTimetablePage(type: Copy) {
from 'docs/onlineTimetable.html'
into "${buildDir}/docs/html5"
}



deployOfflineDocs.dependsOn asciidoctor
processResources.dependsOn deployOfflineDocs

Expand Down
50 changes: 24 additions & 26 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,51 @@
: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} +
Nus Hangs was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team and F11-4 CS2103 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>>]
=== SIM MING HUI MELODIES
image::Happytreat.png[width="200", align="left"]
{empty}[http://github.com/happytreat[github]] [<<happytreat#, portfolio>>]

Role: Project Advisor
Role: Developer +
Responsibilities: Model, Storage, UI and making sure team is on track and updated with each other's progress.

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Documentation.

'''

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

Role: Developer +
Responsibilities: Data
Responsibilities: Testing and Logic.

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading

'''
Responsibilities: Scheduling and Tracking.

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== NG YUAN YUN NIGEL
image::nigelngyy.png[width="150", align="left"]
{empty}[http://github.com/nigelngyy[github]] [<<nigelngyy#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: Testing.

'''
4 changes: 2 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
: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/CS2103-AY1819S1-F11-4/main/issues 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 `e0201044@comp.nus.edu.sg`
Loading