Skip to content

Commit

Permalink
Merge 7c09d1e into 5bbfe67
Browse files Browse the repository at this point in the history
  • Loading branch information
teojunjie committed Nov 11, 2018
2 parents 5bbfe67 + 7c09d1e commit f9e2c94
Show file tree
Hide file tree
Showing 48 changed files with 1,463 additions and 1,028 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -13,8 +13,8 @@ src/test/data/sandbox/
./screenshot*.png
classes/
/bin/
/data/
src/main/resources/docs/
/data/
out/
/config\.json
preferences\.json
Binary file added DemoDataV1.4.zip
Binary file not shown.
3 changes: 1 addition & 2 deletions README.adoc
Expand Up @@ -2,8 +2,7 @@
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/CS2113-AY1819S1-T09-1/main[image:https://travis-ci.org/CS2113-AY1819S1-T09-1/main.svg?branch=master[Build Status]]
https://coveralls.io/repos/github/CS2113-AY1819S1-T09-1/main[image:https://coveralls.io/repos/github/CS2113-AY1819S1-T09-1/main/badge.svg?branch=master[Coverage Status]]

https://coveralls.io/github/CS2113-AY1819S1-T09-1/main?branch=master[image:https://coveralls.io/repos/github/CS2113-AY1819S1-T09-1/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Expand Up @@ -212,7 +212,6 @@ asciidoctor {
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'MakerManager',
'site-githuburl': 'https://cs2113-ay1819s1-t09-1.github.io/main/',
'site-seedu': false, // delete this line if your project is not a fork (not a SE-EDU project)
]

options['template_dirs'].each {
Expand Down
27 changes: 15 additions & 12 deletions docs/AboutUs.adoc
Expand Up @@ -11,39 +11,42 @@ We are a team based in the http://www.comp.nus.edu.sg[School of Computing, Natio
At the time of writing, all 4 of us are Computer Engineering students in our Sophomore year.

== Project Team
Everyone in the team implemented a hand full of features that went together to create MakerManager. Everyone was involved in writing
code for the full stack, documentation and testing. Other than that, each of us had special roles and responsibilities.
These are outlined below.

=== Saif Uddin Mahmud
image::psyf.png[width="150", align="left"]
image::psyf.png[width="150", align="left", float="left"]
{empty}[http://github.com/Psyf[github]] [<<psyf#, portfolio>>]

Role: Product Manager +
Responsibilities: Deliverables and Deadlines
*Role*: Product Manager +
*Responsibilities*: Deliverable and Deadlines

'''

=== Sean Tan
image::trufflepirate.png[width="150", align="left"]
image::trufflepirate.png[width="150", align="left", float="left"]
{empty}[http://github.com/trufflepirate[github]] [<<trufflepirate#, portfolio>>]

Role: Developer +
Responsibilities: Integration and Bug Fixer
*Role*: Developer +
*Responsibilities*: Integration and Bug Fixer

'''

=== Teo Jun Jie
image::teojunjie.png[width="150", align="left"]
image::teojunjie.png[width="150", align="left", float="left"]
{empty}[http://github.com/teojunjie[github]] [<<teojunjie#, portfolio>>]

Role: Developer +
Responsibilities: System Integration
*Role*: Developer +
*Responsibilities*: System Integration

'''

=== Fu Tian yuan
image::ftywan.png[width="150", align="left"]
image::ftywan.png[width="150", align="left", float="left"]
{empty}[http://github.com/ftywan[github]] [<<ftywan#, portfolio>>]

Role: Developer +
Responsibilities: Testing
*Role*: Developer +
*Responsibilities*: Testing

'''
1,136 changes: 764 additions & 372 deletions docs/DeveloperGuide.adoc

Large diffs are not rendered by default.

267 changes: 0 additions & 267 deletions docs/LearningOutcomes.adoc

This file was deleted.

0 comments on commit f9e2c94

Please sign in to comment.