Skip to content

Commit

Permalink
Merge pull request #260 from talesrune/master
Browse files Browse the repository at this point in the history
Updated PPP
  • Loading branch information
talesrune authored Nov 11, 2019
2 parents 3b7fce8 + 036ce47 commit a62a4e9
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 77 deletions.
5 changes: 2 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ endif::[]

* <<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
* Some parts of this application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {

shadowJar {
archiveBaseName = "duke"
archiveVersion = "v1.3.1f"
archiveVersion = "v1.4.1"
archiveClassifier = null
archiveAppendix = null
}
Expand Down
12 changes: 6 additions & 6 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ We are a team based in the http://www.comp.nus.edu.sg[School of Computing, Natio

=== Ting Wei
image::talesrune.png[width="150", align="left"]
{empty}[https://github.com/talesrune[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/team/talesrune.adoc[portfolio]]
{empty}[https://github.com/talesrune[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/team/talesrune.pdf[portfolio]]

Role: Team Lead +
Responsibilities: Gui, Update
Role: Lead Developer +
Responsibilities: GUI, Update

'''

=== Rui Huan
image::e0318465.png[width="150", align="left"]
{empty}[https://github.com/e0318465[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/team/e0318465.adoc[portfolio]]
{empty}[https://github.com/e0318465[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/team/e0318465.adoc[portfolio]]

Role: Developer +
Responsibilities: Contact Management
Expand All @@ -28,7 +28,7 @@ Responsibilities: Contact Management

=== Yu Xuan
image::maxxyx96.png[width="150", align="left"]
{empty}[https://github.com/maxxyx96[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/team/maxxyx96.adoc[portfolio]]
{empty}[https://github.com/maxxyx96[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/team/maxxyx96.adoc[portfolio]]

Role: Developer +
Responsibilities: Budget Management
Expand All @@ -37,7 +37,7 @@ Responsibilities: Budget Management

=== Gervaise Ang
image::gervaiseang.png[width="150", align="left"]
{empty}[https://github.com/gervaiseang[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/team/gervaiseang.adoc[portfolio]]
{empty}[https://github.com/gervaiseang[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/team/gervaiseang.adoc[portfolio]]

Role: Developer +
Responsibilities: Help & Reminders
Expand Down
5 changes: 5 additions & 0 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
= Contact Us
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2113-T13-4/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added docs/team/talesrune.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions src/main/resources/sample/duke.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
T|1|read a book|read page 578
D|0|submit homework|cs1010|10/11/2019 1800
D|0|submit homework|cs1010|13/11/2019 0000
F|1|take computing class|empty|2 hours
T|0|dance|empty
F|0|build a robot|empty|3 hours
D|1|dance two|SAMPLE|02/11/2019 2000
D|1|CS2113 proj|empty|02/11/2019 0000
D|0|cs3230 exam|empty|09/11/2019 1900
D|1|dance two|SAMPLE|15/11/2019 2000
D|1|CS2113 proj|empty|16/11/2019 0000
D|0|cs3230 exam|empty|17/11/2019 1900
T|0|go to supermarket|empty
F|0|nap|empty|4 hours
T|1|running|five laps
Expand Down
63 changes: 0 additions & 63 deletions team/talesrune.adoc

This file was deleted.

0 comments on commit a62a4e9

Please sign in to comment.