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

Fileutil logging #198

Open
wants to merge 227 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
227 commits
Select commit Hold shift + click to select a range
f92884a
change repo badges source from se-edu into our organization
plty Sep 4, 2018
c07e8c6
Merge pull request #3 from CS2103-AY1819S1-W12-1/readme-edit
Sep 4, 2018
b6e89c7
add encrypted slack notification token
plty Sep 4, 2018
7d6b4f8
reformat travis.yml file
plty Sep 4, 2018
4a79844
add unencrypted slack notification token
plty Sep 4, 2018
04f671e
remove team-members placeholder images
plty Sep 4, 2018
94a1cd5
add team-members placeholder photos
plty Sep 4, 2018
8961fed
change AboutUs.adoc template
plty Sep 4, 2018
50f4fc0
Merge pull request #4 from CS2103-AY1819S1-W12-1/travis-ci-slack-inte…
Sep 5, 2018
8f994d6
Merge branch 'master' of github.com:nus-cs2103-AY1819S1/addressbook-l…
plty Sep 9, 2018
095b985
Merge branch 'master' into dev
plty Sep 9, 2018
0b884f0
move coveralls link from address-book to main
plty Sep 9, 2018
faa7e0f
Merge branch 'coveralls-fix' into dev
plty Sep 9, 2018
54c072b
move appveyor link from address-book to main
plty Sep 9, 2018
e4eb9d5
Merge pull request #8 from CS2103-AY1819S1-W12-1/dev
Sep 9, 2018
c03d391
Update badge in README to new repo name
Sep 16, 2018
bbb044b
remove old codacy badge
plty Sep 16, 2018
8e8d139
Update codacy source
Sep 16, 2018
c6e3257
Update badge link
Sep 16, 2018
4ba73e3
change travis badge image source
plty Sep 17, 2018
21a7388
update wrong travis image source change
plty Sep 17, 2018
41c4857
Merge pull request #11 from CS2103-AY1819S1-W12-1/readme/badge
Sep 17, 2018
0b5eedb
Merge pull request #12 from nus-cs2103-AY1819S1/master
plty Sep 18, 2018
7aae71d
add swiftkage and dan-delion photo and template for kevvvinn
plty Sep 18, 2018
de1dfff
moving the photo link to the respective file
plty Sep 18, 2018
6e646f2
Merge branch 'documentation' of github.com:plty/nuspro-lost-and-found…
plty Sep 18, 2018
224d80c
remove learning outcomes LearningOutcomes.adoc
plty Sep 18, 2018
b0a07e8
amend readme, change readme into lost and found
plty Sep 18, 2018
a1cf8f6
User Guide Changes
plty Sep 18, 2018
ee1511b
change developer guide
plty Sep 18, 2018
7c1669f
Merge pull request #16 from plty/documentation
plty Sep 18, 2018
639fb07
Merge pull request #1 from CS2103-AY1819S1-W12-1/master
Sep 18, 2018
31072c4
docs/images: change Ui.png
Sep 18, 2018
7973b31
Edit photo location
Swiftkage Sep 25, 2018
858104b
Merge pull request #21 from Swiftkage/images
Sep 25, 2018
43e7526
Merge branch 'master' into master
plty Oct 1, 2018
de4a105
Merge pull request #17 from dan-delion/master
Oct 1, 2018
a9b5fed
Merge pull request #1 from CS2103-AY1819S1-W12-1/master
Swiftkage Oct 1, 2018
0bf69cd
Modify find command
Swiftkage Oct 1, 2018
2e74822
Modify coding style
Swiftkage Oct 1, 2018
a88b46d
Modify test cases
Swiftkage Oct 2, 2018
64260d5
Update checkstyle
Swiftkage Oct 2, 2018
e7c583a
Change window layout
Oct 2, 2018
5933c10
Update README.adoc
Oct 2, 2018
7cf3a07
Merge pull request #24 from Swiftkage/find
plty Oct 2, 2018
72d8a0c
Merge pull request #26 from CS2103-AY1819S1-W12-1/dan-delion-patch-1
plty Oct 2, 2018
202b562
Merge pull request #2 from CS2103-AY1819S1-W12-1/master
Oct 2, 2018
15cd477
Merge pull request #25 from dan-delion/ui-skeleton
plty Oct 2, 2018
6777402
Merge branch 'master' into develop/ui-skeleton
plty Oct 2, 2018
72ce806
Merge branch 'master' into develop/find
plty Oct 2, 2018
e00f676
Merge pull request #28 from CS2103-AY1819S1-W12-1/develop/ui-skeleton
Oct 2, 2018
ee2cc1d
Merge pull request #27 from CS2103-AY1819S1-W12-1/develop/find
Oct 2, 2018
4a72722
move from person to article
plty Oct 2, 2018
6222f71
Merge pull request #29 from plty/move-to-articles
Oct 2, 2018
3dc7e18
Update UserGuide.adoc
Oct 2, 2018
d40a4d3
Merge pull request #30 from dan-delion/master
plty Oct 2, 2018
b7f92e2
Merge pull request #3 from CS2103-AY1819S1-W12-1/master
Oct 6, 2018
c805f9f
Update ContactUs.adoc
Oct 6, 2018
ad495b3
Update AboutUs.adoc
Oct 6, 2018
a411070
Update UserGuide.adoc
Oct 6, 2018
3781397
Merge pull request #4 from CS2103-AY1819S1-W12-1/master
Oct 6, 2018
24ed030
Fix checkstyle issues.
Oct 7, 2018
52744fb
Update docs/team
Oct 7, 2018
9cd7d25
Fix checkstyleTest issues
Oct 7, 2018
a632ce4
Merge pull request #36 from dan-delion/master
Swiftkage Oct 7, 2018
b1ff346
Merge pull request #5 from CS2103-AY1819S1-W12-1/master
Swiftkage Oct 7, 2018
dbe4733
Minor fxml changes
Oct 8, 2018
ada8630
Add ArticleDetailsPanel
Oct 8, 2018
ef94d68
Add ArticleDetailsPanelHandle
Oct 8, 2018
b2f6e0d
Add ArticleDetailsPanelTest
Oct 8, 2018
1d84ab7
Update MainWindowHandle
Oct 8, 2018
9636913
Update AddressBookSystemTest
Oct 8, 2018
55856af
Update AddressBookSystemTest and HelpWindowSystemTest
Oct 8, 2018
641b3ed
Remove BrowserPanel functionality completely
Oct 8, 2018
70e8978
Fix nonfunctional errors
Oct 8, 2018
5d21fbe
Rename ArticleListCard.fxml to ArticleCard.fxml
Oct 8, 2018
8e775f7
Add newline at eof of CommandBox.fxml
Oct 9, 2018
b41e52f
Merge pull request #40 from dan-delion/master
Oct 9, 2018
43a15b3
Add resolve
Swiftkage Oct 9, 2018
9fa06b5
Update resolve
Swiftkage Oct 9, 2018
f116e6f
Merge pull request #7 from Swiftkage/master
Swiftkage Oct 9, 2018
250acad
Update resolve
Swiftkage Oct 9, 2018
707da1a
Merge pull request #41 from Swiftkage/resolve
Swiftkage Oct 9, 2018
00f0ed0
Add GridPane to article details
Oct 9, 2018
a51cfad
Add placeholder photo in article details
Oct 9, 2018
4d93ca8
Add placeholder photo in article details
Oct 9, 2018
f8f7a86
Merge branch 'master' of github.com:dan-delion/main
Oct 9, 2018
f2cdb19
Merge pull request #42 from dan-delion/master
Oct 11, 2018
a86c711
Add isResolved field
Swiftkage Oct 13, 2018
f5bc5fe
Merge pull request #10 from Swiftkage/master
Swiftkage Oct 13, 2018
07eec7e
change all instances of addressbook into articlelist
plty Oct 13, 2018
dd441ec
renaming file from addressbook to articlelist
plty Oct 13, 2018
73dfb6e
move from seedu.address to seedu.lostandfound
plty Oct 13, 2018
4c4a9ec
change addressbook.jar into articlelist.jar
plty Oct 13, 2018
156cffd
change order of import to comply with checkstyle
plty Oct 13, 2018
c297a03
change from address to description by script
plty Oct 13, 2018
265de82
move back description_book_32.png into address_book_32.png
plty Oct 13, 2018
b8247cb
edit to comply with checkstyle
plty Oct 13, 2018
ba4647d
Add description
Oct 9, 2018
d07090f
Merge pull request #55 from CS2103-AY1819S1-W12-1/move-address-to-des…
plty Oct 13, 2018
573b4a1
Merge pull request #56 from dan-delion/master
Oct 13, 2018
de385aa
resolve by git auto-merge
plty Oct 13, 2018
0189302
move CommandException old link to new one
plty Oct 13, 2018
d347bef
change from address to description
plty Oct 13, 2018
c357c72
remove lol.out
plty Oct 13, 2018
c3f343b
resolve commit conflicts
plty Oct 13, 2018
11992ff
remove trailing space
plty Oct 13, 2018
72d64b1
Merge pull request #57 from CS2103-AY1819S1-W12-1/ui-skeleton-merge
Oct 13, 2018
4dd4e9e
Add name field in finder and owner panels
Oct 13, 2018
99e8b6b
simplify validation regex and message constraints
plty Oct 13, 2018
f181cd2
Fix divider
Oct 13, 2018
0faf68d
Remove grid lines
Oct 13, 2018
48012b7
merge to master
Oct 13, 2018
3968844
Make fxml great again
Oct 14, 2018
7b77294
Make fxml great again again
Oct 14, 2018
236ccad
Make fxml great again again again
Oct 14, 2018
367a99e
Merge branch 'master' into simplify-persons-attribute
Swiftkage Oct 15, 2018
304ca4a
Merge pull request #59 from CS2103-AY1819S1-W12-1/simplify-persons-at…
Swiftkage Oct 15, 2018
2ef6cfd
Update resolve
Swiftkage Oct 15, 2018
ff0fd9e
Update resolve
Swiftkage Oct 16, 2018
32db5d2
update checkstyle
Swiftkage Oct 16, 2018
039870a
Try to resolve merge conflict
Swiftkage Oct 16, 2018
c966e0e
Revert "Try to resolve merge conflict"
Swiftkage Oct 16, 2018
30a2089
Merge pull request #61 from Swiftkage/resolve
Swiftkage Oct 16, 2018
5b13086
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W12-1/mai…
Swiftkage Oct 16, 2018
66b8b40
Fix checkstyle
Swiftkage Oct 16, 2018
9fb779a
Merge pull request #63 from Swiftkage/master
Swiftkage Oct 16, 2018
a2c167a
Merge pull request #64 from CS2103-AY1819S1-W12-1/develop/resolve
plty Oct 16, 2018
1df1b6d
Update find command
Swiftkage Oct 19, 2018
c69f874
Fix checkstyle
Swiftkage Oct 20, 2018
69c87f1
change typo of Descriptiones into Descriptions
plty Oct 20, 2018
aae9adf
Merge pull request #66 from CS2103-AY1819S1-W12-1/remove-typo
plty Oct 20, 2018
1866708
refactor and generalize
plty Oct 20, 2018
7562a01
add sequence class
plty Oct 20, 2018
ddbd190
add Image class
plty Oct 20, 2018
58b153f
Update README.adoc
Oct 22, 2018
8605e11
Merge branch 'master' of github.com:CS2103-AY1819S1-W12-1/main
Oct 22, 2018
846b0b0
Make fxml great again again again again
Oct 22, 2018
207ca03
Update filtered list
Swiftkage Oct 23, 2018
28ac447
Merge pull request #14 from CS2103-AY1819S1-W12-1/master
Swiftkage Oct 23, 2018
4ae4022
Update swiftkage.png
Swiftkage Oct 23, 2018
4dc4eae
Merge pull request #68 from Swiftkage/master
plty Oct 23, 2018
8670165
update dg references from addressbook to articlelist and so on
plty Oct 23, 2018
a14f9d5
Merge pull request #69 from CS2103-AY1819S1-W12-1/docs/dg-update
Swiftkage Oct 23, 2018
34f9172
Update developer guide
Swiftkage Oct 23, 2018
db012b0
Merge branch 'master' into develop/find
plty Oct 23, 2018
3fbf4c3
Merge pull request #70 from CS2103-AY1819S1-W12-1/develop/find
plty Oct 23, 2018
8f01649
Merge pull request #71 from Swiftkage/master
Swiftkage Oct 23, 2018
9aa2e82
Merge branch 'master' into docs/dg-update
Swiftkage Oct 23, 2018
c142436
Merge pull request #72 from CS2103-AY1819S1-W12-1/docs/dg-update
plty Oct 24, 2018
73e8a31
merge master
plty Oct 29, 2018
6fd683a
make path at image stored as an object instead of string
plty Oct 29, 2018
149686c
remove id value bug
plty Oct 29, 2018
3d6f6de
change accessor type of Image class
plty Oct 29, 2018
2006e48
add copy command in FileUtil
plty Oct 29, 2018
9ebf81a
changing signature
plty Oct 29, 2018
6dfb46c
change sequence return type to Integer
plty Oct 29, 2018
3d101eb
add Image to constructor of Article
plty Oct 29, 2018
2c1a41f
adding throws and test data
plty Oct 30, 2018
4386c4c
change placehoder into real image
plty Oct 30, 2018
027900b
default image of an item
plty Oct 30, 2018
6b7258e
test photo
plty Oct 30, 2018
cbc5071
image create filename bug
plty Oct 30, 2018
93d14df
Update UG and Article
Swiftkage Oct 30, 2018
948a9c4
Update UG
Swiftkage Oct 30, 2018
a32c49c
Merge pull request #15 from CS2103-AY1819S1-W12-1/master
Swiftkage Oct 30, 2018
afd004d
Update DG
Swiftkage Oct 30, 2018
ed2e646
Update Article
Swiftkage Oct 30, 2018
a9a06bd
Update UG
Swiftkage Oct 30, 2018
01302c2
Merge pull request #74 from Swiftkage/master
Swiftkage Oct 30, 2018
8d2c4ab
dunno
plty Oct 30, 2018
aaa3e0d
make image editable
plty Oct 30, 2018
67bbce7
Merge pull request #75 from CS2103-AY1819S1-W12-1/yuxi-patch
plty Oct 30, 2018
2a7875d
merging with master
plty Oct 30, 2018
f60b782
Add FINDER and OWNER fields
Swiftkage Oct 30, 2018
026bf59
Update PPP, UG, DG
Swiftkage Oct 31, 2018
4a28ad6
Update DG
Swiftkage Nov 1, 2018
0c7f87f
Update test cases
Swiftkage Nov 2, 2018
0201a7a
Update AboutUs
Swiftkage Nov 2, 2018
dd41f4a
Merge branch 'patch'
Swiftkage Nov 2, 2018
eaf5cc3
Merge branch 'master' into master
Swiftkage Nov 2, 2018
c2b007c
Update build.gradle
Swiftkage Nov 2, 2018
d3aba24
Merge pull request #80 from Swiftkage/master
plty Nov 2, 2018
e065166
Update UG and find
Swiftkage Nov 6, 2018
263575c
Update DG
Swiftkage Nov 6, 2018
84d7689
Merge pull request #16 from CS2103-AY1819S1-W12-1/master
Swiftkage Nov 6, 2018
e8aa991
Merge pull request #122 from Swiftkage/master
Swiftkage Nov 6, 2018
d706565
bugfix on Image testcases and handle null image at xml loading
plty Nov 6, 2018
a595711
merge with master
plty Nov 6, 2018
7fad759
Rename Swiftkage.adoc to swiftkage.adoc
Swiftkage Nov 7, 2018
b46773e
Rename Swiftkage.adoc to swiftkage.adoc
Swiftkage Nov 7, 2018
eb05f90
Change default image, fix app name
Nov 7, 2018
ad1b246
Add finder fields Phone and Email, onto the finder panel.
Nov 7, 2018
26c7285
Remove phone and email from article cards
Nov 7, 2018
09484e1
Wrap article card description.
Nov 7, 2018
ab8b683
Better UI
Nov 7, 2018
5f322d0
Merge pull request #124 from CS2103-AY1819S1-W12-1/develop/default-image
Swiftkage Nov 7, 2018
2f59590
Merge pull request #125 from CS2103-AY1819S1-W12-1/develop/add-finder…
Swiftkage Nov 7, 2018
fc4d786
Merge pull request #126 from CS2103-AY1819S1-W12-1/develop/ui-enhance…
Swiftkage Nov 7, 2018
ca8c200
i have to go home
plty Nov 7, 2018
87b3889
fix xml test
plty Nov 9, 2018
bb41052
Merge pull request #18 from CS2103-AY1819S1-W12-1/master
Swiftkage Nov 10, 2018
1889cf8
Update DG and test cases
Swiftkage Nov 10, 2018
eba398c
Upate project specs
Swiftkage Nov 10, 2018
98445d1
Update UI
Swiftkage Nov 10, 2018
9631c6b
Merge pull request #129 from Swiftkage/master
Swiftkage Nov 10, 2018
2c50385
Update test case data
Swiftkage Nov 10, 2018
a472fa0
Change Article Identity fields
Swiftkage Nov 10, 2018
7e0d4ca
Update DG
Swiftkage Nov 11, 2018
40ff8a3
Update DG
Swiftkage Nov 11, 2018
a524b27
Update Swiftkage PPP
Swiftkage Nov 11, 2018
800bf10
Merge pull request #130 from Swiftkage/master
Swiftkage Nov 12, 2018
0f07b38
xml parser bug fix by setting image to optional
plty Nov 12, 2018
50510f3
Update DG, PPP and find-t
Swiftkage Nov 12, 2018
c77d207
checktyle related updates
plty Nov 12, 2018
eb60eb1
Update test cases
Swiftkage Nov 12, 2018
5c91812
Merge pull request #131 from Swiftkage/master
Swiftkage Nov 12, 2018
364c4ca
Add test cases for Edit
Swiftkage Nov 12, 2018
ac2c6a9
Fix checkstyle
Swiftkage Nov 12, 2018
8ff76c5
Update Add and Edit test cases
Swiftkage Nov 12, 2018
66d4f07
merge with master
plty Nov 12, 2018
060b639
resolve conflict with newest merge
plty Nov 12, 2018
7a73093
Merge branch 'image-integration'
plty Nov 12, 2018
6959b27
Merge pull request #132 from Swiftkage/master
plty Nov 12, 2018
adb87a0
first draft
plty Nov 12, 2018
9afeb3e
jerrell PPP
plty Nov 12, 2018
9c0efb8
improved logging
plty Nov 12, 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
  •  
  •  
  •  
18 changes: 7 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,24 @@ language: java
matrix:
include:
- jdk: oraclejdk9

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

script: "./config/travis/run-checks.sh && travis_retry ./gradlew clean checkstyleMain
checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage"
deploy:
skip_cleanup: true
provider: script
script: ./config/travis/deploy_github_pages.sh
script: "./config/travis/deploy_github_pages.sh"
on:
branch: master

addons:
apt:
packages:
- oracle-java9-installer

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- "$HOME/.gradle/caches/"
- "$HOME/.gradle/wrapper/"
notifications:
slack: mcteamface:gHJoSl4p2cImiN9DidygRzk9
29 changes: 13 additions & 16 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
= Address Book (Level 4)
= Lost and Found
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/CS2103-AY1819S1-W12-1/main[image:https://travis-ci.org/CS2103-AY1819S1-W12-1/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/CS2103-AY1819S1-W12-1/main/branch/master[image:https://ci.appveyor.com/api/projects/status/yvil727ad656xo0d/branch/master?svg=true[Build status]]
https://coveralls.io/github/CS2103-AY1819S1-W12-1/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-W12-1/main/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/CS2103-AY1819S1-W12-1/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103-AY1819S1-W12-1/main&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/8659d1e101a3438cb1fdcff23080c3b4[Codacy Badge]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,26 +14,24 @@ 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.
Welcome to *LostBUTFound*! *LostBUTFound* is a management tool designed to help *administrators manage lost and found articles*.

Managing lost and found articles can be a frustrating experience, especially when there are a huge amount of articles to keep track of. LostBUTFound streamlines this management process and help you to increase your productivity.

More importantly, LostBUTFound 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). Fast typists will find that LostBUTFound can manage lost and found articles faster than traditional GUI applications.


== 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 is based on se-edu's https://github.com/se-edu/addressbook-level4/[Address Book] application.
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by _Marco Jakob_.
* Libraries used: https://github.com/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]
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if (JavaVersion.current() == JavaVersion.VERSION_1_10
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.MainApp'
mainClassName = 'seedu.lostandfound.MainApp'

sourceCompatibility = JavaVersion.VERSION_1_9
targetCompatibility = JavaVersion.VERSION_1_9
Expand Down Expand Up @@ -82,7 +82,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -157,16 +157,16 @@ test {
}

if (runNonGuiTests) {
test.include 'seedu/address/**'
test.include 'seedu/lostandfound/**'
}

if (runGuiTests) {
test.include 'systemtests/**'
test.include 'seedu/address/ui/**'
test.include 'seedu/lostandfound/ui/**'
}

if (!runGuiTests) {
test.exclude 'seedu/address/ui/**'
test.exclude 'seedu/lostandfound/ui/**'
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions copyright.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
Some code adapted from http://code.makery.ch/library/javafx-8-tutorial/ by Marco Jakob

Copyright by Susumu Yoshida - http://www.mcdodesign.com/
- address_book_32.png
- AddressApp.ico

Copyright by Jan Jan Kovařík - http://glyphicons.com/
- calendar.png
- edit.png
Binary file added data/images/0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 17 additions & 33 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,37 @@
: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.}_ +
Lost and Found team! +
{empty} +
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>>]

Role: Project Advisor
=== Bobbie Ramadhani Soedirgo
image::dan-delion.png[width="150", align="left"]
{empty}[https://github.com/dan-delion[github]]
{empty}[https://cs2103-ay1819s1-w12-1.github.io/main/team/dan-delion.html[portfolio]]

'''

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

Role: Team Lead +
Responsibilities: UI
=== Jerrell Ezralemuel
image::plty.png[width="150", align="left"]
{empty}[https://github.com/plty[github]]
{empty}[https://cs2103-ay1819s1-w12-1.github.io/main/team/plty.html[portfolio]]

'''

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

Role: Developer +
Responsibilities: Data
=== Kevin Law
image::kevvvinn.png[width="150", align="left"]
{empty}[https://github.com/kevvvinn[github]]
{empty}[https://cs2103-ay1819s1-w12-1.github.io/main/team/kevvvinn.html[portfolio]]

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
=== Lim Yu Xi
image::swiftkage.png[width="150", align="left"]
{empty}[https://github.com/Swiftkage[github]]
{empty}[https://cs2103-ay1819s1-w12-1.github.io/main/team/swiftkage.html[portfolio]]

'''

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

Role: Developer +
Responsibilities: UI

'''
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-W12-1/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 `sram-b [at] comp.nus.edu.sg`
Loading