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.1][F09-B1]Your TA #80

Open
wants to merge 506 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
506 commits
Select commit Hold shift + click to select a range
369c192
Fixed minor todo-card bug: removed date label
JoonKai1995 Apr 11, 2018
705749b
Login v2.0 working
Pearlissa Apr 11, 2018
7dfc016
Login v2.0 working
Pearlissa Apr 11, 2018
055dce4
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa Apr 11, 2018
0999d31
Update backslashes to forward
Alaru Apr 11, 2018
20a5e8e
Update logic to save Display Picture
Alaru Apr 11, 2018
345fae5
Add MarkCommand integration test
Alaru Apr 11, 2018
9065cd5
add deleteTaskCommandTest and its parser test
WoodySIN Apr 11, 2018
d80e392
add EditTaskCommandTest
WoodySIN Apr 11, 2018
785de63
update collate
WoodySIN Apr 11, 2018
98e15bd
Add integration tests for Participation
Alaru Apr 11, 2018
2c4538e
Add Integration tests
Alaru Apr 12, 2018
1328dd7
Collated files
Alaru Apr 12, 2018
0077a70
Recollate unused files
Alaru Apr 12, 2018
95641bf
Update documentation
Alaru Apr 12, 2018
79f10c1
Updated:
JoonKai1995 Apr 12, 2018
82683db
Updated:
JoonKai1995 Apr 12, 2018
885ba29
Updated:
JoonKai1995 Apr 12, 2018
c3e86b8
Login UGDG
Pearlissa Apr 12, 2018
7e2492b
fix list Command does not show Person List
WoodySIN Apr 12, 2018
aef5a72
Updated:
JoonKai1995 Apr 12, 2018
eda312d
Update DG
Alaru Apr 12, 2018
b6064a4
Updated:
JoonKai1995 Apr 12, 2018
af15008
Updated:
JoonKai1995 Apr 12, 2018
42dea4a
Updated:
JoonKai1995 Apr 12, 2018
02697a0
fix bugs in list command test
WoodySIN Apr 12, 2018
3da2bbb
Login UGDG added user class
Pearlissa Apr 12, 2018
73a9a93
remove unused imports
WoodySIN Apr 12, 2018
f63161f
remove unused imports in commandtasktestutil and taskbuilder
WoodySIN Apr 12, 2018
2be58ce
PPP_v1
Pearlissa Apr 12, 2018
09e4c7d
remove inconsistent System Test
WoodySIN Apr 12, 2018
741c700
inconsistent system test
WoodySIN Apr 12, 2018
bb0a04d
Finished implementation of DisplayPic in DG
Alaru Apr 12, 2018
8b3779f
Finished implementation portion for DisplayPic and Participation in DG
Alaru Apr 12, 2018
1fd7c38
Upload pictures for DG
Alaru Apr 12, 2018
83daf6e
Update DeveloperGuide.adoc
Alaru Apr 12, 2018
06ac2a2
Update PPP
Alaru Apr 12, 2018
c541a4f
Merge remote-tracking branch 'origin/v1.5rcdocumentation' into v1.5rc…
Alaru Apr 12, 2018
5147fb4
Update UG
Alaru Apr 12, 2018
675f9b7
update ug and ppp
Alaru Apr 12, 2018
f421a55
fix a bug of reload to do list
WoodySIN Apr 12, 2018
e55b860
Merge branch 'master' into master
WoodySIN Apr 12, 2018
7d66707
add task related methods in system tests
WoodySIN Apr 12, 2018
8b7628d
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 12, 2018
bce48de
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN Apr 12, 2018
d3a39bc
Merge pull request #100 from Pearlissa/Login_v2
Alaru Apr 12, 2018
f25a147
Merge pull request #103 from JoonKai1995/UG_DG_FInal
Alaru Apr 12, 2018
10c5c25
Merge branch 'master' into UGDG_login
Alaru Apr 12, 2018
3f1e26a
Merge pull request #104 from Pearlissa/UGDG_login
Alaru Apr 12, 2018
645131f
Merge pull request #106 from JoonKai1995/PPP
Alaru Apr 12, 2018
e16e28e
Merge branch 'master' into PPP
Alaru Apr 12, 2018
4f06dec
Merge pull request #107 from Pearlissa/PPP
Alaru Apr 12, 2018
5a9492f
fix some bugs in system test
WoodySIN Apr 12, 2018
f7c2db3
remove incompatiable system tests
WoodySIN Apr 12, 2018
e7330b4
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 12, 2018
c339318
Merge branch 'master' into 1.4bugfixes
WoodySIN Apr 12, 2018
9400852
Merge pull request #84 from Alaru/1.4bugfixes
WoodySIN Apr 12, 2018
6b4b432
Documentation: update application icon and default display picture
Alaru Apr 12, 2018
7791c0e
Merge branch 'v1.5rctest' into v1.5rcdocumentation
Alaru Apr 12, 2018
e52349f
remove collate
WoodySIN Apr 12, 2018
86c0850
Merge branch 'master' into v1.5rcdocumentation
WoodySIN Apr 12, 2018
8120314
Merge pull request #108 from Alaru/v1.5rcdocumentation
WoodySIN Apr 12, 2018
a4a9625
Delete Wu.md
WoodySIN Apr 12, 2018
56020fb
Delete Wu.md
WoodySIN Apr 12, 2018
bb903d7
update collate
WoodySIN Apr 12, 2018
9284912
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 12, 2018
b0a7d33
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN Apr 12, 2018
80b70d8
Revert "Add login feature: v1.5rc"
Alaru Apr 12, 2018
a24ccde
Merge pull request #110 from CS2103JAN2018-F09-B1/revert-100-Login_v2
WoodySIN Apr 12, 2018
40a3049
fix no eof
WoodySIN Apr 12, 2018
aaaeaa5
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 12, 2018
bf53275
Logic: Add support to delete display pictures
Alaru Apr 12, 2018
8cd0120
update PPP
WoodySIN Apr 12, 2018
36ada65
add javadocmethod to Participation isValidParticipation method
WoodySIN Apr 12, 2018
32a714b
remove systemtests
WoodySIN Apr 12, 2018
b27eb83
no message
WoodySIN Apr 12, 2018
efd3733
no message
WoodySIN Apr 12, 2018
c9b6a3f
fix style errors
WoodySIN Apr 12, 2018
d5c8b83
Merge pull request #109 from WoodySIN/master
WoodySIN Apr 12, 2018
8aff6a2
Merge pull request #111 from Alaru/v1.5rcdocumentation
WoodySIN Apr 12, 2018
5edca32
Issues fixes.
JoonKai1995 Apr 13, 2018
03914d6
fix edittask and deleteTask bugs
WoodySIN Apr 13, 2018
14fea03
fix deleteTaskcommand bug
WoodySIN Apr 13, 2018
7db1751
Issues fixes.
JoonKai1995 Apr 13, 2018
f12007c
Issues fixes.
JoonKai1995 Apr 13, 2018
56818e2
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 Apr 13, 2018
b340316
login fix, .xml file can now be created and new accounts start with s…
Pearlissa Apr 13, 2018
3211749
login fix, .xml file can now be created and new accounts start with s…
Pearlissa Apr 13, 2018
c8e87ff
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
Pearlissa Apr 13, 2018
43f6a5b
Login Bug fix
Pearlissa Apr 13, 2018
d10df78
Issues fixes.
JoonKai1995 Apr 13, 2018
148a493
fixed checkstyles
Pearlissa Apr 13, 2018
91181cb
STORAGE: Fix deletion of display pictures
Alaru Apr 13, 2018
5fd12fa
Merge branch 'Bug_fixes'
JoonKai1995 Apr 14, 2018
eb21c02
#1 add list task command
WoodySIN Apr 14, 2018
2dd5163
removed an unused import in CommandTestUtil
WoodySIN Apr 14, 2018
be3dc01
Fixed storage bug for task deadline.
JoonKai1995 Apr 14, 2018
435670f
revert
WoodySIN Apr 14, 2018
365a695
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN Apr 14, 2018
271b43a
add task list commands
WoodySIN Apr 14, 2018
e6c63b4
update UG
WoodySIN Apr 14, 2018
6f3f6c8
remove unused import
WoodySIN Apr 14, 2018
a66d6f5
Storage: Add logging to DisplayPicStorage
Alaru Apr 14, 2018
7d0b65e
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 14, 2018
c488773
Merge pull request #118 from WoodySIN/master
Alaru Apr 14, 2018
c7296c9
Logic: Update logging when deleting image files/display pictures
Alaru Apr 14, 2018
0b130ab
Logic: Update logging when deleting image files/display pictures
Alaru Apr 14, 2018
fb2635d
Documentation: Update DG
Alaru Apr 14, 2018
5fb8e2c
Documentation: Fix DG english. Change use cases.
Alaru Apr 14, 2018
90d3434
Documentation: Fix DG english.
Alaru Apr 14, 2018
4c08098
reverted tasklist back to UniqueTaskList
JoonKai1995 Apr 14, 2018
fe2d842
Merge pull request #114 from Pearlissa/login_fix
JoonKai1995 Apr 14, 2018
f9884bc
reverted tasklist back to UniqueTaskList
JoonKai1995 Apr 14, 2018
d2e8a63
reverted tasklist back to UniqueTaskList
JoonKai1995 Apr 14, 2018
a29bb10
Documentation: Fix comments and update some typos.
Alaru Apr 14, 2018
290242e
login testing
Pearlissa Apr 14, 2018
bfd9af6
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa Apr 14, 2018
3ce0562
Code: Checkstyle fixes
Alaru Apr 14, 2018
03dec4c
Tests: Fix application name change
Alaru Apr 14, 2018
161d886
Fixed minor bug:
JoonKai1995 Apr 14, 2018
8a756c3
Removed collated file
JoonKai1995 Apr 14, 2018
ce47e73
Merge branch 'master' into Test_cases
JoonKai1995 Apr 14, 2018
ab44de2
login testing
Pearlissa Apr 14, 2018
468c8b7
Documentation: DG fixes
Alaru Apr 14, 2018
af7d20b
Merge pull request #121 from JoonKai1995/Test_cases
JoonKai1995 Apr 14, 2018
a633d09
Added support to access username and changed filepaths.
JoonKai1995 Apr 14, 2018
ed18237
Added support to access username and changed filepaths.
JoonKai1995 Apr 14, 2018
b533de7
Storage: Removed check if duplicate image when creating filename
Alaru Apr 14, 2018
8a7d75e
Storage: Removed check if duplicate image when creating filename
Alaru Apr 14, 2018
7fd6a0e
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 14, 2018
b372dd1
Documentation: Collated Alaru code
Alaru Apr 14, 2018
7abea23
Code: Fix missing newline
Alaru Apr 14, 2018
5ecf671
Codestyle: Removed unused import
Alaru Apr 14, 2018
1bfa720
Documentation: Update UG and added screenshots
Alaru Apr 14, 2018
37ed9d9
update DG
WoodySIN Apr 14, 2018
a2977a9
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 14, 2018
7afd073
Merge pull request #123 from Alaru/v1.5allChanges
WoodySIN Apr 14, 2018
feef68c
update ppp
WoodySIN Apr 14, 2018
1d704ef
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 14, 2018
5466f87
update UGDG and add sample data
WoodySIN Apr 15, 2018
19ec455
Merge pull request #124 from WoodySIN/master
WoodySIN Apr 15, 2018
22520bb
update PPP
WoodySIN Apr 15, 2018
e99a77f
add user tests in DG
WoodySIN Apr 15, 2018
f979d7c
Made Login page display prompt text on errors
JoonKai1995 Apr 15, 2018
0979311
Made Login page display promot text on errors
JoonKai1995 Apr 15, 2018
5e5b18f
Merge branch 'Login_user_text'
JoonKai1995 Apr 15, 2018
3bd919d
Made Login page display promot text on errors
JoonKai1995 Apr 15, 2018
5f0c32a
Update Login.java
JoonKai1995 Apr 15, 2018
d1a8b41
Update Login.java
JoonKai1995 Apr 15, 2018
203704f
login testing
Pearlissa Apr 15, 2018
387e3aa
login testing
Pearlissa Apr 15, 2018
cb0959b
login testing
Pearlissa Apr 15, 2018
89ca9e5
Documentation: Update Alaru PPP, UGDG
Alaru Apr 15, 2018
2d575e8
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa Apr 15, 2018
d64c68a
Updated DG for calendar and matriculation number
JoonKai1995 Apr 15, 2018
5ef2f5a
Merge remote-tracking branch 'origin/UGDG_FINAL' into UGDG_FINAL
JoonKai1995 Apr 15, 2018
de9a2c7
Merge pull request #127 from Pearlissa/login_testing
JoonKai1995 Apr 15, 2018
e6375fc
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 Apr 15, 2018
bb0ccb3
Documentation: Merged Wudi changes
Alaru Apr 15, 2018
81bcf95
Documentation: Add unused code
Alaru Apr 15, 2018
f05eee7
Merge branch 'UGDG_FINAL' of https://github.com/JoonKai1995/main into…
Alaru Apr 15, 2018
1a8d9d7
Updated login tests, all works now.
JoonKai1995 Apr 15, 2018
a36d892
Merge pull request #128 from JoonKai1995/UGDG_FINAL
JoonKai1995 Apr 15, 2018
998d82b
Merge branch 'master' into LoginStorage_test
JoonKai1995 Apr 15, 2018
0c4aeab
Update LoginManager.java
JoonKai1995 Apr 15, 2018
18c5e33
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 15, 2018
4b737c7
Merge branch 'LoginStorage_test' of https://github.com/JoonKai1995/ma…
Alaru Apr 15, 2018
567ea79
Update LoginManager.java
JoonKai1995 Apr 15, 2018
0a87790
Merge pull request #129 from JoonKai1995/LoginStorage_test
JoonKai1995 Apr 15, 2018
591ac17
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 15, 2018
a8eb823
Documentation:
Alaru Apr 15, 2018
ed513b1
Documentation:
Alaru Apr 15, 2018
3f0c8f2
Checkstye: Fixed EOF errors
Alaru Apr 15, 2018
ea3aec1
Merge pull request #125 from WoodySIN/master
Alaru Apr 15, 2018
45633ba
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 15, 2018
3af6cbd
Documentation: Rename UIInitial to UI
Alaru Apr 15, 2018
081cb26
collated_pearlissa
Pearlissa Apr 15, 2018
4f405e5
collated_pearlissa
Pearlissa Apr 15, 2018
380420f
Merge branch 'master' into login_testing
Pearlissa Apr 15, 2018
939da56
Merge pull request #130 from Alaru/v1.5allChanges
JoonKai1995 Apr 15, 2018
401afd0
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
Pearlissa Apr 15, 2018
13ff1ff
Updated PPP, slight bit on UG and collated code for JoonKai1995.
JoonKai1995 Apr 15, 2018
2747801
Found small typo in DG
JoonKai1995 Apr 15, 2018
7a50428
Documentation: Recollated files
Alaru Apr 15, 2018
5824c56
Merge branch 'LoginStorage_test' of https://github.com/JoonKai1995/ma…
Alaru Apr 15, 2018
2a2fd1e
Documentation: UserGuide fixed broken switchTab link
Alaru Apr 15, 2018
6e28e42
Fixed naming issue causing jar file to hang.
JoonKai1995 Apr 15, 2018
b4d0c51
Merge pull request #133 from Alaru/v1.5allChanges
JoonKai1995 Apr 15, 2018
d9a9059
Merge branch 'Jar_fix' of https://github.com/JoonKai1995/main into v1…
Alaru Apr 15, 2018
8227468
Fixed naming issue causing jar file to hang.
JoonKai1995 Apr 15, 2018
364998a
Merge branch 'master' into Jar_fix
JoonKai1995 Apr 15, 2018
fd89703
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 Apr 15, 2018
1049c76
Updated PPP.
JoonKai1995 Apr 15, 2018
19b5f64
Merge remote-tracking branch 'origin/Jar_fix' into Jar_fix
JoonKai1995 Apr 15, 2018
7709a1f
changed fxml file names in java controllers to lower case.
JoonKai1995 Apr 15, 2018
787c4d1
Update invalidUserLogin.xml
JoonKai1995 Apr 15, 2018
1633d42
Update Login.fxml
JoonKai1995 Apr 15, 2018
b722ebb
Merge branch 'Jar_fix' of https://github.com/JoonKai1995/main into v1…
Alaru Apr 15, 2018
be420be
Merge pull request #135 from JoonKai1995/Jar_fix
WoodySIN Apr 15, 2018
72b102f
Merge pull request #131 from Pearlissa/login_testing
WoodySIN Apr 15, 2018
a697367
change it to String FXML name to lower case
WoodySIN Apr 15, 2018
3decd39
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 15, 2018
69d2523
Version: Changed version to 1.5.0 non early access
Alaru Apr 15, 2018
c975d29
UG_final
Pearlissa Apr 15, 2018
07ad367
UG_final
Pearlissa Apr 15, 2018
accbae3
UG_final
Pearlissa Apr 15, 2018
ccf8870
Merge branch 'master' into UGDG_final
JoonKai1995 Apr 15, 2018
efadaba
Merge pull request #136 from Pearlissa/UGDG_final
JoonKai1995 Apr 15, 2018
004e015
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
a68e9bb
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 15, 2018
cde3b67
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
77ade58
Corrected UG link
JoonKai1995 Apr 15, 2018
48f2fd1
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
ae8e698
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
790e19c
update PPP
WoodySIN Apr 15, 2018
22bb08f
Update JoonKai1995.adoc
JoonKai1995 Apr 15, 2018
fbbe862
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
JoonKai1995 Apr 15, 2018
fe58087
Corrected UG link
JoonKai1995 Apr 15, 2018
88cd863
Corrected PPP
JoonKai1995 Apr 15, 2018
aa91201
DG_final
Pearlissa Apr 15, 2018
51819b4
Documentation: UG - fix case sensitive images
Alaru Apr 15, 2018
600c909
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa Apr 15, 2018
6da295d
collated_final
Pearlissa Apr 15, 2018
038ea85
collated_final
Pearlissa Apr 15, 2018
f0d020d
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
4083fd2
Update AddressBookParserTest.java
JoonKai1995 Apr 15, 2018
b16be19
Merge pull request #140 from Pearlissa/UGDG_final
JoonKai1995 Apr 15, 2018
568a55f
Merge pull request #139 from JoonKai1995/master
JoonKai1995 Apr 15, 2018
8f45128
Merge pull request #138 from WoodySIN/master
JoonKai1995 Apr 15, 2018
d7cc7f7
Merge branch 'master' into added_collate
JoonKai1995 Apr 15, 2018
6799cfb
Merge pull request #141 from Pearlissa/added_collate
JoonKai1995 Apr 15, 2018
7a33b08
Documentation: UGDG fixes
Alaru Apr 15, 2018
43af59a
Corrected PPP, and collated final.
JoonKai1995 Apr 15, 2018
7da27ff
Merge pull request #142 from JoonKai1995/PPP_and_finalcollate
JoonKai1995 Apr 15, 2018
f93a2e0
Logic: markPart now can only add 1 to 100
Alaru Apr 15, 2018
c96c5f8
Logic: markPart now can only add 1 to 100
Alaru Apr 15, 2018
a508e8c
Documentation: Fix typo in UG
Alaru Apr 15, 2018
7f1e3ac
Reverted Logic: markPart now can only add 1 to 100
Alaru Apr 15, 2018
ab7a0e8
Merge pull request #143 from Alaru/v1.5allChanges
Alaru Apr 15, 2018
ed5f601
PPP_final
Pearlissa Apr 15, 2018
a8d6fac
Update MarkCommand.java
Alaru Apr 15, 2018
ce87bfd
Merge branch 'master' into PPP_final
JoonKai1995 Apr 15, 2018
b735add
Merge pull request #144 from Pearlissa/PPP_final
JoonKai1995 Apr 15, 2018
eb60156
Update MarkCommand.java
Alaru Apr 15, 2018
892fe3a
remove collate
WoodySIN Apr 15, 2018
f56a7b1
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 15, 2018
aec191d
update collate
WoodySIN Apr 15, 2018
d1f5838
update collate name
WoodySIN Apr 16, 2018
aa64d13
update collate name
WoodySIN Apr 16, 2018
4b653a3
Rename wudi.adoc to WoodySIN.adoc
WoodySIN Apr 21, 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
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ classes/
/bin/
src/main/resources/docs/
out/
Collate-TUI.jar
Collate-GUI.jar
19 changes: 19 additions & 0 deletions ImportInvalid.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
John Doe
98765432
[email protected]
311, Clementi Ave 2, #02-25
owesMoney
friends

Alex Neo
87438807
[email protected]
Blk 30 Geylang Street 29, #06-40
family

Berinice Yu
99272758
[email protected]
Blk 30 Lorong 3 Serangoon Gardens, #07-18
colleagues
friends
30 changes: 30 additions & 0 deletions ImportValid.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addressbook>
<persons>
<name>John Doe</name>
<phone>98765432</phone>
<email>[email protected]</email>
<address>311, Clementi Ave 2, #02-25</address>
<tagged>owesMoney</tagged>
<tagged>friends</tagged>
</persons>
<persons>
<name>Alex Neo</name>
<phone>87438807</phone>
<email>[email protected]</email>
<address>Blk 30 Geylang Street 29, #06-40</address>
<tagged>family</tagged>
</persons>
<persons>
<name>Berinice Yu</name>
<phone>99272758</phone>
<email>[email protected]</email>
<address>Blk 30 Lorong 3 Serangoon Gardens, #07-18</address>
<tagged>colleagues</tagged>
<tagged>friends</tagged>
</persons>
<tags>owesMoney</tags>
<tags>friends</tags>
<tags>family</tags>
<tags>colleagues</tags>
</addressbook>
Empty file modified LICENSE
100644 → 100755
Empty file.
17 changes: 8 additions & 9 deletions README.adoc
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
= Address Book (Level 4)
= Your TA
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-F09-B1/main[image:https://travis-ci.org/CS2103JAN2018-F09-B1/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-F09-B1/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-F09-B1/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]]

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).
* This is a desktop "Your TA" application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is an address book cum scheduler targeted at making tracking students for NUS student teaching assistants' easier.
* 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.

== Site Map

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

== Acknowledgements

* This application was adapted from https://github.com/nus-cs2103-AY1718S2/addressbook-level4[AddressBook Level-4]
* 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_.
* Application icon made by http://www.freepik.com[Freepik] from https://www.flaticon.com[Flaticon].
* Default display picture made by https://www.flaticon.com/authors/iconnice[Iconnice] from https://www.flaticon.com[Flaticon].
* 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]

== Licence : link:LICENSE[MIT]
Empty file modified _config.yml
100644 → 100755
Empty file.
Empty file modified appveyor.yml
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies {
}

shadowJar {
archiveName = "addressbook.jar"
archiveName = "yourta.jar"

destinationDir = file("${buildDir}/jar/")
}
Expand Down
13 changes: 13 additions & 0 deletions collated/functional/Alaru-reused.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Alaru-reused
###### \java\seedu\address\commons\util\HashUtil.java
``` java
private static String toHex(byte[] hashValue) {
StringBuilder sb = new StringBuilder();
for (byte b : hashValue) {
sb.append(Integer.toString((b & 0xff) + 0x100, 16).substring(1));
}
return sb.toString();
}

}
```
Loading