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

[W14-2] FomoFoto #28

Open
wants to merge 1,137 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 203 commits
Commits
Show all changes
1137 commits
Select commit Hold shift + click to select a range
d0034c8
Merge remote-tracking branch 'upstream/master'
kayheen Apr 14, 2019
33e57b8
Try to improve code quality.
kayheen Apr 14, 2019
dab13e0
Merge pull request #251 from kayheen/master
thamsimun Apr 14, 2019
0c0918b
update to ug
itszp Apr 14, 2019
35d4231
edit userguide
thamsimun Apr 14, 2019
e1613c5
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 14, 2019
75d43fc
add addison picture
kayheen Apr 14, 2019
9e37639
Delete Carrein.png
kayheen Apr 14, 2019
b91710b
Add addison picture
kayheen Apr 14, 2019
a6143a3
Resolve Travis
kayheen Apr 14, 2019
24e0ad3
Merge pull request #252 from thamsimun/master
kayheen Apr 14, 2019
b99e615
Merge pull request #253 from kayheen/master
thamsimun Apr 14, 2019
9fd2e6a
remove unused lines
randytqw Apr 14, 2019
d4df9dd
Merge remote-tracking branch 'upstream/master'
randytqw Apr 14, 2019
8523a3e
Update appendix.
Apr 14, 2019
c618c9e
test
itszp Apr 14, 2019
8a038fe
Fix merge conflict.
Apr 14, 2019
fd26329
Merge remote-tracking branch 'upstream/master'
itszp Apr 14, 2019
fe4e091
Add newline EOF.
Apr 14, 2019
25e3869
Merge pull request #246 from Carrein/master
thamsimun Apr 14, 2019
2490827
Merge pull request #254 from itszp/master
Apr 14, 2019
3cb6ad1
Fix broken links in PP.
Apr 14, 2019
2bd97a6
Fix broken links in Documentation.
Apr 14, 2019
2927ab2
Add EOF.
Apr 14, 2019
59dec65
Update image filters in dev guide
thamsimun Apr 14, 2019
a988802
Solve merge conflicts
thamsimun Apr 14, 2019
2dbd865
Remove unused methods.
Apr 14, 2019
3c6303d
edit dev guide
thamsimun Apr 14, 2019
66f76e1
Merge pull request #255 from Carrein/master
kayheen Apr 14, 2019
bca8f35
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 14, 2019
346e222
solve merge conflicts
thamsimun Apr 14, 2019
dfd5249
Move classes to respective folders.
Apr 14, 2019
b1af5af
edit logic sequence diagram in dev guide
thamsimun Apr 14, 2019
6dee35a
Change colours for sequence diagrams in dev guide
thamsimun Apr 14, 2019
48bd2a0
Update sequence diagrams.
Apr 14, 2019
3a4e9ad
Merge pull request #256 from thamsimun/master
kayheen Apr 14, 2019
45a58ab
Merge remote-tracking branch 'upstream/master'
Apr 14, 2019
0863c0d
Fix lexographical orders.
Apr 14, 2019
fcfa5ef
Refactor FomoFotoParser.
Apr 14, 2019
acb6398
Update reposense for simun and randy.
Apr 14, 2019
43865fb
Merge pull request #257 from Carrein/master
randytqw Apr 14, 2019
f9b28b0
Merge remote-tracking branch 'upstream/master'
randytqw Apr 14, 2019
bee24ba
Merge remote-tracking branch 'upstream/master'
randytqw Apr 14, 2019
e7741f2
Edits to developer guide
kayheen Apr 14, 2019
ddca896
Merge remote-tracking branch 'upstream/master'
kayheen Apr 14, 2019
27b613a
Update AboutUs.adoc
Apr 14, 2019
3d2ac12
Merge remote-tracking branch 'upstream/master'
kayheen Apr 14, 2019
5398c39
Reduce page length of portfolio.
Apr 14, 2019
5834331
Reduce page length of portfolio part 2.
Apr 14, 2019
7e19969
Merge remote-tracking branch 'upstream/master'
Apr 14, 2019
c5427bd
Merge pull request #259 from Carrein/master
Apr 14, 2019
4cfa734
Merge pull request #258 from kayheen/master
itszp Apr 14, 2019
3d5bfe3
Fix sequence diagram naming.
Apr 14, 2019
26b4036
Shorten portfolio length.
Apr 14, 2019
a0e58cb
Merge pull request #260 from Carrein/master
Apr 14, 2019
21cd9dd
Chaneg Rotate Command Sequence diagram
kayheen Apr 14, 2019
6f808ea
Merge remote-tracking branch 'upstream/master'
kayheen Apr 14, 2019
f72828a
Edit a few lines in DG
kayheen Apr 14, 2019
b3e66d9
Make diagrams smaller.
Apr 14, 2019
11de42e
More edits to EG
kayheen Apr 14, 2019
f3ca8f8
Merge pull request #261 from Carrein/master
Apr 14, 2019
8614f1c
Edit watermark in DG
kayheen Apr 14, 2019
e5606ab
Update portfolio.
Apr 14, 2019
c11c234
edit methods for watermark
kayheen Apr 14, 2019
3f2e0d8
Merge remote-tracking branch 'upstream/master'
Apr 14, 2019
52711ce
Resize image.
Apr 14, 2019
688f477
Merge remote-tracking branch 'upstream/master'
kayheen Apr 14, 2019
df74659
Merge pull request #262 from Carrein/master
Apr 14, 2019
8abb7ec
Update tag.
Apr 14, 2019
186d184
Merge pull request #264 from Carrein/master
Apr 14, 2019
df35425
Merge pull request #263 from kayheen/master
kayheen Apr 14, 2019
1591337
update dg
itszp Apr 14, 2019
43a7ca4
Updates to portfolio.
Apr 14, 2019
1246df0
Edits to watermark command.
kayheen Apr 14, 2019
f23e154
Merge remote-tracking branch 'upstream/master'
Apr 14, 2019
93e8d46
Remove test images
kayheen Apr 14, 2019
a011dee
update dg
itszp Apr 14, 2019
b09de65
Merge pull request #265 from Carrein/master
Apr 14, 2019
594e82b
Merge remote-tracking branch 'upstream/master'
itszp Apr 14, 2019
c4c1ed6
Merge remote-tracking branch 'upstream/master'
itszp Apr 14, 2019
74c95db
Userguide additions
kayheen Apr 14, 2019
04da2ee
updates
itszp Apr 14, 2019
6021b44
Edit DG and kayheen.adoc
kayheen Apr 14, 2019
7d7c712
Merge remote-tracking branch 'upstream/master'
kayheen Apr 14, 2019
45c980f
Change rotate diagram
kayheen Apr 14, 2019
2aed986
Merge pull request #267 from kayheen/master
kayheen Apr 14, 2019
0df204a
Refactor rotate, crop, resize command.
kayheen Apr 14, 2019
8c657cc
remove images
kayheen Apr 14, 2019
4fdcd1e
Fix the letters in the DG titles
kayheen Apr 14, 2019
46dccf4
Change rotate sequence diagram
kayheen Apr 14, 2019
45dba74
made the images smaller
kayheen Apr 14, 2019
1019b98
made the images slightly larger
kayheen Apr 14, 2019
e2489be
Revert "made the images slightly larger"
kayheen Apr 14, 2019
cf7a76e
Revert "made the images smaller"
kayheen Apr 14, 2019
e98293d
updates
itszp Apr 14, 2019
1fab63c
Add watermark image
kayheen Apr 14, 2019
7901485
clear the images:
kayheen Apr 14, 2019
f7c2866
Add ppt for WaterMark command
kayheen Apr 14, 2019
1a60e59
DG STUFF
randytqw Apr 14, 2019
d88d546
Merge remote-tracking branch 'upstream/master'
randytqw Apr 14, 2019
f6e2a17
Merge pull request #268 from kayheen/master
kayheen Apr 14, 2019
acf4f72
add author thing
randytqw Apr 14, 2019
cace11a
Add some changes for watermark
kayheen Apr 14, 2019
dbb8cb7
Export sequence diagram
randytqw Apr 14, 2019
8fab964
Merge pull request #269 from kayheen/master
kayheen Apr 14, 2019
06fa3aa
add preset commands to dev guide
thamsimun Apr 14, 2019
83758fa
clear album
thamsimun Apr 14, 2019
e848688
major update
itszp Apr 14, 2019
87ac054
Merge remote-tracking branch 'upstream/master'
itszp Apr 14, 2019
bc5e8ed
typo
itszp Apr 14, 2019
938e7cb
fix merge conflicts
thamsimun Apr 14, 2019
e32503b
update format
itszp Apr 14, 2019
7d65f77
tweaks
itszp Apr 14, 2019
ca78605
Edit developer guide to standardize certain parts
thamsimun Apr 14, 2019
f04655e
added line break
itszp Apr 14, 2019
8c10eda
fix travis
thamsimun Apr 14, 2019
41d1f1f
Merge pull request #271 from thamsimun/master
Apr 14, 2019
ebc52d2
Merge branch 'master' into master
itszp Apr 14, 2019
d3aab2e
Merge pull request #266 from itszp/master
Apr 14, 2019
cf75f77
help
itszp Apr 14, 2019
b7fc862
latest
itszp Apr 14, 2019
920d819
Merge remote-tracking branch 'upstream/master'
itszp Apr 14, 2019
b32e595
Merge pull request #272 from itszp/master
itszp Apr 14, 2019
3cea3f9
Revert "DG and UG"
itszp Apr 14, 2019
0769318
Merge pull request #273 from CS2103-AY1819S2-W14-2/revert-272-master
itszp Apr 14, 2019
616ae99
Update DeveloperGuide.adoc
itszp Apr 14, 2019
8f0cdbb
minor change
itszp Apr 14, 2019
0f7fe3f
Merge pull request #274 from itszp/master
Apr 14, 2019
40ca0d5
extra
itszp Apr 14, 2019
586bf5f
update PPP
itszp Apr 14, 2019
5642573
remove duplicates
itszp Apr 14, 2019
6d31ca3
update
itszp Apr 14, 2019
d4d8e80
Edit PPP
thamsimun Apr 14, 2019
74f034c
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 14, 2019
06320eb
Merge pull request #275 from itszp/master
thamsimun Apr 14, 2019
5b20485
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 14, 2019
41607d6
Modify logic sequence diagrams due to some changes in the command code
thamsimun Apr 14, 2019
e3e775c
Edit sequence diagrams
thamsimun Apr 14, 2019
e33dcea
Edit a small mistake in ppp
thamsimun Apr 14, 2019
28e74ba
Remove stuff from my ppp
thamsimun Apr 14, 2019
a4fb86c
Merge pull request #276 from thamsimun/master
thamsimun Apr 14, 2019
ff8f5df
minor edits to dg
itszp Apr 15, 2019
708d558
Merge remote-tracking branch 'upstream/master'
itszp Apr 15, 2019
edc97d7
minor edits to dg
itszp Apr 15, 2019
7a5eb52
Edit kayheen.adoc
kayheen Apr 15, 2019
67656da
More edits to kayheen.adoc
kayheen Apr 15, 2019
983c28f
Merge pull request #278 from kayheen/master
itszp Apr 15, 2019
5937808
cut more from adoc
kayheen Apr 15, 2019
75c8e78
Further cuts
kayheen Apr 15, 2019
c517a6a
Cut ppp
thamsimun Apr 15, 2019
7992742
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 15, 2019
6c14b10
English changes and fix travis
kayheen Apr 15, 2019
3e91b7a
Merge pull request #279 from kayheen/master
kayheen Apr 15, 2019
d21f41e
cut ppp
thamsimun Apr 15, 2019
b9d4d32
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 15, 2019
7dfc571
Made ppp shorter
thamsimun Apr 15, 2019
918d38e
Cut adoc even more
kayheen Apr 15, 2019
2875880
Edit ppp
thamsimun Apr 15, 2019
70b73e9
cut out from adoc
kayheen Apr 15, 2019
855121c
edit ppp
thamsimun Apr 15, 2019
be80256
edit ppp
thamsimun Apr 15, 2019
d6ab38e
More changes to adoc
kayheen Apr 15, 2019
fccbbd1
edit ppp
thamsimun Apr 15, 2019
3f0aef7
edit ppp
thamsimun Apr 15, 2019
ed81361
cut more
kayheen Apr 15, 2019
dfa2011
change sequence diagram sequence
kayheen Apr 15, 2019
3c57b83
solve problem
kayheen Apr 15, 2019
deb78fc
solve problem
kayheen Apr 15, 2019
cffe53e
edit watermark
kayheen Apr 15, 2019
ad43a69
edit about us
thamsimun Apr 15, 2019
8b389ae
more edits to DG
kayheen Apr 15, 2019
490d7f8
change sequence of rotate
kayheen Apr 15, 2019
123b8c7
Merge pull request #280 from thamsimun/master
itszp Apr 15, 2019
52c2349
Merge pull request #281 from kayheen/master
itszp Apr 15, 2019
f96cf17
cut adoc
kayheen Apr 15, 2019
d1ccd45
edit adoc
kayheen Apr 15, 2019
6e46f3a
Merge pull request #277 from itszp/master
thamsimun Apr 15, 2019
a23820a
Merge remote-tracking branch 'upstream/master'
kayheen Apr 15, 2019
2a78057
change stuff
kayheen Apr 15, 2019
403e586
edit user guide for standardization
thamsimun Apr 15, 2019
05774b3
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 15, 2019
423705e
edit user guide
thamsimun Apr 15, 2019
4ee4552
remove walkthrough
kayheen Apr 15, 2019
4b71862
changes to adoc
kayheen Apr 15, 2019
26d60c8
cut abit
kayheen Apr 15, 2019
d02b077
final edit
kayheen Apr 15, 2019
832c185
add PPP stuff
randytqw Apr 15, 2019
4b4f55c
Merge remote-tracking branch 'upstream/master'
randytqw Apr 15, 2019
eb8d77b
Merge pull request #282 from kayheen/master
kayheen Apr 15, 2019
d456f2c
Merge pull request #283 from thamsimun/master
randytqw Apr 15, 2019
abc6779
Merge remote-tracking branch 'upstream/master'
randytqw Apr 15, 2019
a344e70
Merge pull request #284 from randytqw/master
thamsimun Apr 15, 2019
9454b48
Update DeveloperGuide.adoc
randytqw Apr 15, 2019
0ca555d
Update DeveloperGuide.adoc
randytqw Apr 15, 2019
31cba88
Update DeveloperGuide.adoc
randytqw Apr 15, 2019
c440d88
Chnage Ui name.
kayheen Apr 15, 2019
012adaf
Fix portfolio spelling errors using Grammarly.
Apr 15, 2019
5538dfe
clear album
kayheen Apr 15, 2019
f68e956
Merge remote-tracking branch 'upstream/master'
kayheen Apr 15, 2019
84c7348
remove ui.png
kayheen Apr 15, 2019
b81ddc5
Update README.adoc
kayheen Apr 15, 2019
604533f
Fix UserGuide spelling errors using Grammarly.
Apr 15, 2019
5b20fff
Merge remote-tracking branch 'upstream/master'
Apr 15, 2019
fb64190
add Ui.png
kayheen Apr 15, 2019
27ca029
Merge branch 'master' of https://github.com/kayheen/main
kayheen Apr 15, 2019
a0201d1
update export command
randytqw Apr 15, 2019
21e7349
Edit command example in code
thamsimun Apr 15, 2019
37eadaa
Update ExportCommand.java
randytqw Apr 15, 2019
3ca35f7
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 15, 2019
88ac383
Merge pull request #285 from kayheen/master
thamsimun Apr 15, 2019
fcf0ae7
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 15, 2019
0a47502
Fix DeveloperGuide spelling errors using Grammarly.
Apr 15, 2019
68b3603
Merge remote-tracking branch 'upstream/master'
Apr 15, 2019
9a84992
Merge pull request #286 from thamsimun/master
Apr 15, 2019
c2a0411
Merge remote-tracking branch 'upstream/master'
Apr 15, 2019
3d2389d
edit
thamsimun Apr 15, 2019
045b579
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 15, 2019
8c3e94f
Fix Size Constructor bug.
Apr 15, 2019
859298e
Merge pull request #287 from thamsimun/master
Apr 15, 2019
7f9b4cf
Merge remote-tracking branch 'upstream/master'
Apr 15, 2019
84ae985
Fix unused imports.
Apr 15, 2019
eb53e40
Update issue templates
Apr 15, 2019
2c4e39e
Merge pull request #288 from Carrein/master
thamsimun Apr 15, 2019
74c9b38
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 15, 2019
22589ef
Correct grammar in PPP
thamsimun Apr 15, 2019
e54e5af
Merge pull request #289 from thamsimun/master
thamsimun Apr 15, 2019
0d63926
Edit grammer errors in ug, dg and adoc
kayheen Apr 15, 2019
feb3097
edit ug
kayheen Apr 15, 2019
a017468
minor edit to ug
kayheen Apr 15, 2019
7b5105f
Edit developer guide grammar
thamsimun Apr 15, 2019
4fd7833
Change sequence diagrams
kayheen Apr 15, 2019
cec855c
Change watermark command seq diagram ppt
kayheen Apr 15, 2019
6a6374e
Update randytqw.adoc
randytqw Apr 15, 2019
b34f14c
change sequence diagram for contrast command
thamsimun Apr 15, 2019
0fe7ca0
Merge remote-tracking branch 'upstream/master'
thamsimun Apr 15, 2019
af493e8
Update randytqw.adoc
randytqw Apr 15, 2019
48d0614
Merge pull request #290 from kayheen/master
thamsimun Apr 15, 2019
98e8630
changes
itszp Apr 15, 2019
ead65c6
Merge remote-tracking branch 'upstream/master'
itszp Apr 15, 2019
e822453
grammar
itszp Apr 15, 2019
bc53534
changes
itszp Apr 15, 2019
9157d04
Merge pull request #291 from thamsimun/master
Apr 15, 2019
03c39f8
Merge pull request #292 from itszp/master
Apr 15, 2019
c47316d
Update DeveloperGuide.adoc
kayheen Apr 15, 2019
96f3ffc
format error
itszp Apr 15, 2019
063e570
Merge remote-tracking branch 'upstream/master'
itszp Apr 15, 2019
9ff8b46
extra space
itszp Apr 15, 2019
8fd51d5
Update DeveloperGuide.adoc
Apr 15, 2019
8c132a5
Merge pull request #293 from itszp/master
Apr 15, 2019
f3a296b
Change kayheen.png
kayheen May 10, 2024
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
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-fixes-to-be-implemented-.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Feature/fixes to be implemented.
about: Open an issue about features or fixes to be implemented.
title: "[BUG]"
labels: ''
assignees: ''

---

## Expected Behaviour


## Actual Behaviour


## Steps to Reproduce the Problem

1.
2.
3.

## Specifications

- Version:
- Platform:
- Subsystem:
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/nice-to-have-.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Nice to have.
about: Open an issue about a QOL issue.
title: "[QOL]"
labels: ''
assignees: ''

---

## Feature Request


## Steps to Use the Feature

1.
2.
3.

## Specifications

- Version:
- Platform:
- Subsystem:
26 changes: 13 additions & 13 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
= Address Book (Level 4)
= FomoFoto
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-AY1819S2-W14-2/main[image:https://travis-ci.org/CS2103-AY1819S2-W14-2/main.svg?branch=master[Build Status]]
https://coveralls.io/github/CS2103-AY1819S2-W14-2/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S2-W14-2/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -14,19 +12,20 @@ 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.
FomoFoto is a Java based, command line photo editor.

== Features

* Command-line editor with minimal GUI.
* Large filter and photo manipulation tool-sets.
* Import and export in large variety of photos.
* Support for layers and history.


== Site Map

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

Expand All @@ -35,5 +34,6 @@ endif::[]
* 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://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
* The original source of the AddressBook project was created by the https://github.com/se-edu/[SE-EDU] initiative.

== Licence : link:LICENSE[MIT]
12 changes: 12 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,18 @@ dependencies {
testRuntimeOnly group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-9+181'
testRuntimeOnly group:'org.junit.vintage', name:'junit-vintage-engine', version: jUnitVersion
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
compile group: 'com.drewnoakes', name: 'metadata-extractor', version: '2.6.2'
compile group: 'org.apache.commons', name: 'commons-io', version: '1.3.2'
compile group: 'net.imagej', name: 'ij', version: '1.52k'
// https://mvnrepository.com/artifact/org.imgscalr/imgscalr-lib
compile group: 'org.imgscalr', name: 'imgscalr-lib', version: '4.2'
// https://mvnrepository.com/artifact/com.sksamuel.scrimage/scrimage-core
compile group: 'com.sksamuel.scrimage', name: 'scrimage-core_2.12', version: '3.0.0-alpha4'
// https://mvnrepository.com/artifact/com.sksamuel.scrimage/scrimage-filters
compile group: 'com.sksamuel.scrimage', name: 'scrimage-filters_2.12', version: '3.0.0-alpha4'



}

shadowJar {
Expand Down
45 changes: 23 additions & 22 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,54 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
AddressBook - FomoFoto was developed by CS2103-AY1819S2-W14-2 +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{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>>]
=== Ho Boon Wee Addison
image::Carrein.png[width="150", align="left"]
{empty}[https://github.com/Carrein[github]] [<<johndoe#, portfolio>>]

Role: Project Advisor
Role: Team Lead +
Responsibilities: Scheduling and Tracking, UI

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Integration, Image State Management (undo, redo)

'''

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

Role: Developer +
Responsibilities: Data
Responsibilities: Code quality, Import/Export

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Testing, Image Filters

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Documentation, Image Manipulation

'''
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-AY1819S2-W14-2/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 `kayheen@u.nus.edu`
Loading