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

[T12-3] JalilEnterprises #71

Open
wants to merge 624 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
624 commits
Select commit Hold shift + click to select a range
be85936
Merge pull request #159 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Oct 31, 2018
6917ad3
Finished deleteTagCommand
gaoqikai Oct 31, 2018
4099009
fixed check
gaoqikai Oct 31, 2018
9ac9c10
Merge pull request #163 from gaoqikai/master
gaoqikai Oct 31, 2018
cfddcda
UGDG for deleteTag
gaoqikai Oct 31, 2018
83e94dc
Merge pull request #165 from gaoqikai/master
gaoqikai Oct 31, 2018
5c00f00
fixed UG
gaoqikai Oct 31, 2018
30729c5
Merge pull request #167 from gaoqikai/master
gaoqikai Oct 31, 2018
94ea120
Update AboutUs.adoc
gaoqikai Oct 31, 2018
4fc0ba7
changed version number
gaoqikai Oct 31, 2018
8e43376
App creates an xml for account database, and implemented commands for…
Oct 31, 2018
4f2048f
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T12-3/mai…
Oct 31, 2018
8184126
fixed StockListParser merge conflict
Oct 31, 2018
ddc4a99
Merge pull request #168 from Davindran/v1.3
Davindran Oct 31, 2018
664d87b
updated UG for login
Oct 31, 2018
d3543d1
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T12-3/mai…
Oct 31, 2018
d1bd5d1
Merge pull request #169 from Davindran/v1.3
Davindran Oct 31, 2018
8062681
Implemented OpenCommand for .jar executable, replaced fileaspage.html…
Oct 31, 2018
9484926
Merge branch 'saveStockListVersion' of https://github.com/kelvintanka…
Oct 31, 2018
5ddfb0e
Fixed checkstyle error
kelvintankaiboon Oct 31, 2018
cd1c182
Fixed checkstyle error
kelvintankaiboon Oct 31, 2018
627b062
Fixed checkstyle error
kelvintankaiboon Oct 31, 2018
a47c036
Merge pull request #170 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Oct 31, 2018
ffc9a98
Fixed .jar file bug
Nov 1, 2018
1652f53
Working XML code
Nov 2, 2018
033255e
CheckStyle for travis
Nov 2, 2018
794eebb
Merge pull request #172 from ChewKinWhye/master
ChewKinWhye Nov 2, 2018
da0ec82
resolve conflicts between changeStatus and lost and found
HeHaowei Nov 2, 2018
5ec1c88
fix
HeHaowei Nov 2, 2018
f6e7253
fix
HeHaowei Nov 2, 2018
5b896d0
Merge pull request #173 from HeHaowei/master
HeHaowei Nov 2, 2018
ad99193
Update UserGuide.adoc
gaoqikai Nov 3, 2018
91511ec
Update UserGuide.adoc
gaoqikai Nov 3, 2018
6a5c1e5
Update UserGuide.adoc
gaoqikai Nov 3, 2018
5516838
no message
gaoqikai Nov 3, 2018
d57fd07
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T12-3/main
gaoqikai Nov 3, 2018
24b42b1
Merge pull request #11 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 4, 2018
a33673a
save lost&found list
HeHaowei Nov 4, 2018
6d03ef0
fix bugs
HeHaowei Nov 4, 2018
54bded5
fix bugs
HeHaowei Nov 4, 2018
22736e8
fix bugs
HeHaowei Nov 4, 2018
32c1221
fix bugs
HeHaowei Nov 4, 2018
a635dc9
Merge pull request #205 from HeHaowei/master
HeHaowei Nov 4, 2018
3bddf24
minor changes
HeHaowei Nov 4, 2018
9143d1e
minor changes
HeHaowei Nov 4, 2018
95b2d66
Merge pull request #206 from HeHaowei/master
HeHaowei Nov 4, 2018
4ce3027
Merge branch 'master' of https://github.com/gaoqikai/main
gaoqikai Nov 4, 2018
1fb2d18
Fixed find in UG
gaoqikai Nov 4, 2018
4049f2c
Merge pull request #12 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 5, 2018
90906a9
update invalid message in lost and found
HeHaowei Nov 5, 2018
9eca0bf
fix
HeHaowei Nov 5, 2018
0115587
Merge pull request #207 from HeHaowei/master
HeHaowei Nov 5, 2018
5719ef0
update userguide
HeHaowei Nov 5, 2018
6b35cd4
Merge pull request #208 from HeHaowei/master
HeHaowei Nov 5, 2018
df304d1
fix bugs in editcommand with lost&found
HeHaowei Nov 5, 2018
d8b6064
updated status in editcommand
HeHaowei Nov 5, 2018
160bfa6
Merge pull request #209 from HeHaowei/master
HeHaowei Nov 5, 2018
38bd053
no message
gaoqikai Nov 7, 2018
1d21e70
done PPP
gaoqikai Nov 7, 2018
008e92f
Fixed PPP
gaoqikai Nov 7, 2018
925dd70
Updated UserGuide and DeveloperGuide as well as Project Portfolio Page
Nov 7, 2018
a2a8343
Merge pull request #210 from gaoqikai/master
gaoqikai Nov 7, 2018
7ba0e7d
Merge pull request #211 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Nov 7, 2018
e400056
Included link to project code dashboard in PPP
Nov 7, 2018
a624e75
fixed PPP
gaoqikai Nov 7, 2018
ff1674b
Merge pull request #212 from gaoqikai/master
gaoqikai Nov 7, 2018
56f4037
Merge pull request #13 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 7, 2018
a606997
Merge pull request #214 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Nov 8, 2018
6d3618f
Updated template.xsl in docs
Nov 8, 2018
5825dfc
fixed checkstyle
gaoqikai Nov 9, 2018
6525413
Added ability to view accounts via the message box, login logic that …
Nov 9, 2018
2ad0df2
Merge pull request #216 from gaoqikai/master
gaoqikai Nov 9, 2018
ee85b40
fixed some checkStyle issues and commented out LogicManagerTest
Nov 9, 2018
68edb9a
removed unused username variable
Nov 9, 2018
b010556
Merge pull request #217 from Davindran/v1.4
Davindran Nov 9, 2018
f0c1520
UG bug
Nov 11, 2018
2629a33
UG update
Nov 11, 2018
492097b
UG update
Nov 11, 2018
15acec7
UG update
Nov 11, 2018
5ba2939
UG class diagrams update
Nov 11, 2018
3a83256
Merge pull request #221 from ChewKinWhye/master
ChewKinWhye Nov 11, 2018
0c956c3
Updated DG status feature
Nov 11, 2018
f8cda72
Updated DG
Nov 11, 2018
970e952
updated UG and user story in DG, and fixed a bug where you can delete…
Nov 11, 2018
f120d53
Merge branch 'master' into v1.4
Davindran Nov 11, 2018
6d9f3a7
Merge pull request #222 from Davindran/v1.4
Davindran Nov 11, 2018
1b671c6
did some tests
gaoqikai Nov 11, 2018
1d1e64d
fixed checkstyle in test
gaoqikai Nov 11, 2018
97d7ed8
Merge pull request #223 from gaoqikai/master
gaoqikai Nov 11, 2018
411df05
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T12-3/mai…
Nov 11, 2018
42c2e9c
Fixed ContactUS
gaoqikai Nov 11, 2018
33641b6
Merge pull request #224 from gaoqikai/master
gaoqikai Nov 11, 2018
604cbc9
Merge pull request #14 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 11, 2018
17467c4
Updating PPP
Nov 11, 2018
350b72a
Merge pull request #225 from ChewKinWhye/master
ChewKinWhye Nov 11, 2018
50e970a
fixed PPP
gaoqikai Nov 11, 2018
f147087
Merge pull request #226 from gaoqikai/master
gaoqikai Nov 11, 2018
4284e63
Merge pull request #15 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 11, 2018
68fb170
Updating PPP
Nov 11, 2018
e50cc4e
Merge pull request #227 from ChewKinWhye/master
ChewKinWhye Nov 11, 2018
d67e89a
Updating PPP
Nov 11, 2018
3580ed5
Merge pull request #228 from ChewKinWhye/master
ChewKinWhye Nov 11, 2018
4ed8c75
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T12-3/mai…
Nov 11, 2018
97d8f23
Fixing PPP bugs
Nov 11, 2018
1e135f3
Merge pull request #229 from ChewKinWhye/master
ChewKinWhye Nov 11, 2018
34327b6
fixed ppp
gaoqikai Nov 11, 2018
ceb4fd3
Merge pull request #230 from gaoqikai/master
gaoqikai Nov 11, 2018
60e11e1
Updating PPP and getting travis to work
Nov 11, 2018
7556801
Merge pull request #231 from ChewKinWhye/master
ChewKinWhye Nov 11, 2018
8b54822
update ppp
HeHaowei Nov 11, 2018
63e79cb
Merge pull request #232 from HeHaowei/master
HeHaowei Nov 11, 2018
51cd887
fix bugs in ppp
HeHaowei Nov 11, 2018
91996c2
Merge pull request #233 from HeHaowei/master
HeHaowei Nov 11, 2018
f375295
Updated UserGuide and DeveloperGuide
Nov 11, 2018
0db72ec
updated DG and fixed a minor bug for edit account commmand in which t…
Nov 11, 2018
452e6d2
Merge branch 'v1.4' of https://github.com/Davindran/main into v1.4
Nov 11, 2018
85e0299
fix
HeHaowei Nov 11, 2018
42fc78e
Merge pull request #234 from HeHaowei/master
HeHaowei Nov 11, 2018
eb69011
Merge pull request #235 from Davindran/v1.4
Davindran Nov 11, 2018
1e3f6cb
fix ppp
HeHaowei Nov 11, 2018
cbb78d8
Merge pull request #236 from HeHaowei/master
HeHaowei Nov 11, 2018
8abf3ed
fix ppp
HeHaowei Nov 11, 2018
f41cb84
Merge pull request #237 from HeHaowei/master
HeHaowei Nov 11, 2018
b555143
Undid accidental change to gitignore
Nov 11, 2018
9fe5a20
Added lost column to show on table when OpenCommand is called
Nov 11, 2018
5152975
Merge pull request #239 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Nov 11, 2018
17249fb
some test
gaoqikai Nov 11, 2018
49a6f99
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T12-3/main
gaoqikai Nov 11, 2018
f5dd88f
fixed travis
gaoqikai Nov 11, 2018
88b1f9e
Merge pull request #241 from gaoqikai/master
gaoqikai Nov 11, 2018
6113f96
Finished writing test cases
Nov 12, 2018
ad2d3a2
Merge branch 'master' into master
ChewKinWhye Nov 12, 2018
3504a0b
Fixing travix bug
Nov 12, 2018
79ddfff
Merge branch 'master' of https://github.com/ChewKinWhye/JalilEnterpri…
Nov 12, 2018
438e6ca
Fixing travis bug
Nov 12, 2018
c05b3da
Fixing travis bugs
Nov 12, 2018
69f4d44
Merge pull request #245 from ChewKinWhye/master
ChewKinWhye Nov 12, 2018
e4d2594
fixed login issue for test cases
Nov 12, 2018
f68ba34
commented out failing test cases and fixed checkStyle for tests
Nov 12, 2018
166b62e
Merge branch 'master' into v1.4
Davindran Nov 12, 2018
cbac274
Merge pull request #246 from Davindran/v1.4
Davindran Nov 12, 2018
c096ba2
commented out FindCommandTest
Nov 12, 2018
6cda4aa
Merge pull request #247 from Davindran/v1.4
Davindran Nov 12, 2018
0325613
Updating Developer Guide
Nov 12, 2018
0032a28
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T12-3/main
Nov 12, 2018
e5286fd
Making travis work
Nov 12, 2018
4a15853
Merge pull request #248 from ChewKinWhye/master
ChewKinWhye Nov 12, 2018
7e0aa8e
Marking code for RepoSense
Nov 12, 2018
78af44d
Merge pull request #249 from ChewKinWhye/master
ChewKinWhye Nov 12, 2018
ae89ad9
Merge pull request #16 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 12, 2018
ba1cc0d
fixed DG, added findCommandTest
gaoqikai Nov 12, 2018
80a239d
UG bug fixing
Nov 12, 2018
bf98758
changed diagrams
gaoqikai Nov 12, 2018
fe9eac5
Merge pull request #250 from gaoqikai/master
gaoqikai Nov 12, 2018
b80dfef
update test
HeHaowei Nov 12, 2018
fdb8da6
Merge pull request #251 from HeHaowei/master
HeHaowei Nov 12, 2018
c95531a
Edited Developer Guide and updated Ui.png
Nov 12, 2018
91fd5fe
Merge pull request #17 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 12, 2018
34373d1
Added TagCommandTest
gaoqikai Nov 12, 2018
e3e2a71
Implemented basic tests for OpenCommand
Nov 12, 2018
82b2e1f
Updating use cases
Nov 12, 2018
5c0bdde
Merge pull request #252 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Nov 12, 2018
3de0f57
Fixed typo in Developer Guide affecting Project Portfolio Page indent…
Nov 12, 2018
3cb2e7b
Updating UG
Nov 12, 2018
3f28e5c
update UG
HeHaowei Nov 12, 2018
b554615
Fixed TagCommandTest
gaoqikai Nov 12, 2018
02da2b5
Updating DG
Nov 12, 2018
a64f5e4
Fixed codacy error
Nov 12, 2018
314779a
Merge branch 'master' into master
ChewKinWhye Nov 12, 2018
0da09ce
Merge pull request #256 from HeHaowei/master
HeHaowei Nov 12, 2018
7259c99
Fixed TagCommandTest
gaoqikai Nov 12, 2018
781fddd
fixed
gaoqikai Nov 12, 2018
e8ad89c
Merge pull request #257 from ChewKinWhye/master
ChewKinWhye Nov 12, 2018
fbaec0a
Merge pull request #255 from gaoqikai/master
gaoqikai Nov 12, 2018
c03206a
fix
gaoqikai Nov 12, 2018
a6714ac
Merge pull request #254 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Nov 12, 2018
0ee53ea
Fixing bug in loan list
Nov 12, 2018
3ef1f20
Merge pull request #258 from gaoqikai/master
gaoqikai Nov 12, 2018
7cf2d5e
updated UG and DG and added test cases for DeleteAccountCommand
Nov 12, 2018
4a5b523
Merge branch 'master' into v1.4
Davindran Nov 12, 2018
3447188
Merge pull request #259 from Davindran/v1.4
Davindran Nov 12, 2018
2b96f89
update lost&found test
HeHaowei Nov 12, 2018
1907211
fix
HeHaowei Nov 12, 2018
bff7b00
fix
HeHaowei Nov 12, 2018
73a97e1
updated AddTagCommand and DG
gaoqikai Nov 12, 2018
f7903d9
Merge pull request #260 from HeHaowei/master
HeHaowei Nov 12, 2018
985afe6
fixed
gaoqikai Nov 12, 2018
a9e77d9
fix code quality
gaoqikai Nov 12, 2018
fe9991c
fix again
gaoqikai Nov 12, 2018
edf02a3
Merge pull request #261 from gaoqikai/master
gaoqikai Nov 12, 2018
abc0aee
ppp update
HeHaowei Nov 12, 2018
933127c
Merge pull request #262 from HeHaowei/master
HeHaowei Nov 12, 2018
d3a1efc
Revert "ppp update"
HeHaowei Nov 12, 2018
4f4275c
Merge pull request #263 from CS2113-AY1819S1-T12-3/revert-262-master
HeHaowei Nov 12, 2018
9e965a6
fix ppp
HeHaowei Nov 12, 2018
2ef51cd
Merge branch 'master' into master
HeHaowei Nov 12, 2018
0f98022
Merge pull request #18 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 12, 2018
afa4338
Updates to User Guide
Nov 12, 2018
45f8a8f
Merge pull request #268 from ChewKinWhye/master
ChewKinWhye Nov 12, 2018
93424c9
Made some changes to Developer Guide
Nov 12, 2018
613ada0
update test cases
HeHaowei Nov 12, 2018
4b4620d
update test cases
HeHaowei Nov 12, 2018
7aace81
Merge branch 'master' of https://github.com/HeHaowei/main
HeHaowei Nov 12, 2018
fa01966
fix
HeHaowei Nov 12, 2018
61cf26c
Merge pull request #269 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Nov 12, 2018
737b80f
fix
HeHaowei Nov 12, 2018
b31ecc5
update DG
HeHaowei Nov 12, 2018
832a9d6
updated tags for DG and reflected accordingly in PPP. also indicated …
Nov 12, 2018
f82d7f4
fix
HeHaowei Nov 12, 2018
7edd2c0
Merge branch 'v1.4' of https://github.com/Davindran/main into v1.4
Nov 12, 2018
15fc7f7
Merge branch 'master' into v1.4
Davindran Nov 12, 2018
6dff73e
Added sequence diagram
gaoqikai Nov 12, 2018
afc8c3e
Merge pull request #271 from Davindran/v1.4
Davindran Nov 12, 2018
3a34cff
Merge pull request #272 from gaoqikai/master
gaoqikai Nov 12, 2018
8521fea
fix bugs
HeHaowei Nov 12, 2018
e50222b
Merge branch 'master' into master
HeHaowei Nov 12, 2018
a88de82
Merge pull request #270 from HeHaowei/master
HeHaowei Nov 12, 2018
f8ed5cb
update test cases
HeHaowei Nov 12, 2018
dbcffaf
Merge pull request #19 from CS2113-AY1819S1-T12-3/master
HeHaowei Nov 12, 2018
8606dc2
Merge branch 'master' of https://github.com/HeHaowei/main
HeHaowei Nov 12, 2018
f18c654
fix
HeHaowei Nov 12, 2018
0e18e68
checkstyle update
HeHaowei Nov 12, 2018
3dfd4c7
updated encryption details in UG DG
Nov 12, 2018
2254491
updated encryption details in UG and DG
Nov 12, 2018
375d7d6
Merge branch 'v1.4' of https://github.com/Davindran/main into v1.4
Nov 12, 2018
486f21b
update
HeHaowei Nov 12, 2018
72c333e
fixing
HeHaowei Nov 12, 2018
ef02445
Merge pull request #274 from Davindran/v1.4
Davindran Nov 12, 2018
acd0e11
fixed
HeHaowei Nov 12, 2018
b269a76
fix!!!!!!!!!
HeHaowei Nov 12, 2018
de49e36
fix
HeHaowei Nov 12, 2018
6121a94
fix indentation
HeHaowei Nov 12, 2018
bb79b82
fix indentation
HeHaowei Nov 12, 2018
b8bc89b
update DG
HeHaowei Nov 12, 2018
50d1874
UGDG bugs
Nov 12, 2018
da264ff
Merge branch 'master' into master
HeHaowei Nov 12, 2018
78584bc
DG bugs
Nov 12, 2018
6623edb
Fixing DG bugs
Nov 12, 2018
ce79ea8
fix
HeHaowei Nov 12, 2018
f42876b
Merge branch 'master' of https://github.com/HeHaowei/main
HeHaowei Nov 12, 2018
c9ecc0a
Merge pull request #273 from HeHaowei/master
HeHaowei Nov 12, 2018
de5f2ee
Merge branch 'master' into master
ChewKinWhye Nov 12, 2018
1ecb5e2
Merge pull request #275 from ChewKinWhye/master
ChewKinWhye Nov 12, 2018
236321e
Fixed bug in SaveCommandParser
Nov 12, 2018
7153227
Merge pull request #276 from kelvintankaiboon/saveStockListVersion
kelvintankaiboon Nov 12, 2018
caf0297
fixed readme
gaoqikai Nov 12, 2018
4a17e30
updated portfolio
Jan 27, 2019
61a9346
Merge pull request #277 from Davindran/v1.4
Davindran Jan 27, 2019
9671ab1
updated portfolio
Apr 16, 2019
2116abb
Merge pull request #278 from Davindran/v1.4
Davindran Apr 16, 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
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ preferences.json
classes/
/data/
/bin/
src/main/resources/docs/
out/
/versions/
/src/main/resources/docs/
Binary file added Collate-TUI.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ MIT License

Copyright (c) 2016 Software Engineering Education - FOSS Resources

Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any item obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Software, and to permit items to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
Expand Down
33 changes: 12 additions & 21 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,41 +1,32 @@
= Address Book (Level 4)
= JalilEnterprises
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://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
https://travis-ci.org/CS2113-AY1819S1-T12-3/main[image:https://travis-ci.org/CS2113-AY1819S1-T12-3/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/gaoqikai/main[image:https://ci.appveyor.com/api/projects/status/436ch41il0wo8259/branch/master?svg=true[Build status]]
https://app.codacy.com/project/CS2113-AY1819S1-T12-3/main/dashboard[image:https://api.codacy.com/project/badge/Grade/d58395f1d4e14eab986c887e16859476[Codacy Badge]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
endif::[]

//ifndef::env-github[]
//image::docs/images/Ui.png[width="600"]
//endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* This is a desktop Jalil Enterprises Stock List application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* This application is inspired by our own observation of the work done by the lab technicians, and ideas on how it can be improved.
* It is a Java application intended for CG (Computer Engineering) lab technicians to help them manage the lab equipments.

== 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_.
* This application was morphed from the original AddressBook application.
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]

9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -126,7 +126,7 @@ nonGuiTests.dependsOn test
task(allTests)

// `allTests` implies both `guiTests` and `nonGuiTests`
allTests.dependsOn guiTests
//allTests.dependsOn guiTests
allTests.dependsOn nonGuiTests

test {
Expand Down Expand Up @@ -207,8 +207,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': 'JalilEnterprises',
'site-githuburl': 'https://github.com/CS2113-AY1819S1-T12-3/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand All @@ -233,6 +233,7 @@ task deployOfflineDocs(type: Copy) {
include 'stylesheets/*'
include 'images/*'
include 'HelpWindow.html'
include 'template.xsl'
}
}

Expand Down
Loading