Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
234 commits
Select commit Hold shift + click to select a range
65465ca
Change AboutUs.md
lestertj Oct 1, 2016
0a71477
Correct AboutUs.md
lestertj Oct 1, 2016
e667334
Change UserGuide
lestertj Oct 1, 2016
409b4df
Add 'component' to each member
lestertj Oct 1, 2016
0261dd3
Edit program name
lestertj Oct 1, 2016
67fde20
Refactor all class names
lestertj Oct 1, 2016
233f00d
Update User Guide and Developer Guide
PankajB1997 Oct 2, 2016
39bce34
Minor change to Developer Guide
PankajB1997 Oct 2, 2016
cd24726
Minor update to Developer Guide
PankajB1997 Oct 2, 2016
66162d9
Update About Us and Contact Us page
PankajB1997 Oct 2, 2016
f64b91e
Update NFR from Java 7 to Java 8 in Developer Guide
PankajB1997 Oct 2, 2016
bd07c91
Update User Guide
PankajB1997 Oct 2, 2016
e371212
Minor update to User Guide
PankajB1997 Oct 2, 2016
e3c3160
Rename Person to Task
lestertj Oct 4, 2016
18b2e45
Merge pull request #1 from CS2103AUG2016-T11-C1/complete_rename
lestertj Oct 4, 2016
9adf549
Change Product Name temporarily to Smart Scheduler
PankajB1997 Oct 4, 2016
4141c56
Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main
PankajB1997 Oct 4, 2016
c907aea
Refactor person to task
PankajB1997 Oct 5, 2016
9f38ea7
Changed Address Class to Unique ID
lestertj Oct 5, 2016
6dc90ef
Correct syntax error in LogicManagerTest.java
PankajB1997 Oct 5, 2016
084c128
Merge pull request #2 from CS2103AUG2016-T11-C1/Restructure_Person
PankajB1997 Oct 5, 2016
6c6d9cd
Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main
PankajB1997 Oct 5, 2016
2402f02
Modified removed 'address' input in addcommand
lestertj Oct 5, 2016
77f6b53
Removed Address in LogicManagerTest
lestertj Oct 5, 2016
9d1e619
Resolved merge conflict
lestertj Oct 5, 2016
7edd520
Add NoteCommand
fionnatong Oct 5, 2016
d429e30
Merge branch 'modify_add_command'
lestertj Oct 5, 2016
2e37517
Update UI prototype for User Guide
PankajB1997 Oct 5, 2016
c28a7c4
Update User Guide
PankajB1997 Oct 5, 2016
6152f66
Update README.md
PankajB1997 Oct 5, 2016
a58fec9
Update Parser for NoteCommand
fionnatong Oct 5, 2016
41226f3
Add acknowledgement to README.md
PankajB1997 Oct 5, 2016
76c5cb7
Edit indentation of Parser
fionnatong Oct 5, 2016
1e75bf4
Update User Guide link for Help command
PankajB1997 Oct 5, 2016
597cb3a
Merge branch 'floating_tasks' of https://github.com/CS2103AUG2016-T11…
PankajB1997 Oct 5, 2016
6dd588b
Update ModelManager and TaskList
fionnatong Oct 5, 2016
c64fd00
Corrected documentation
lestertj Oct 5, 2016
f452fe5
Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main
PankajB1997 Oct 5, 2016
cabfa85
Merge branch 'floating_tasks' of https://github.com/CS2103AUG2016-T11…
PankajB1997 Oct 5, 2016
bd2b8c5
Add pattern for Note
fionnatong Oct 5, 2016
8b3810c
Merge branch 'floating_tasks' of https://github.com/CS2103AUG2016-T11…
lestertj Oct 5, 2016
382aa3e
Edit EndTime and StartTime
fionnatong Oct 5, 2016
3f0eb30
Minor changes
fionnatong Oct 5, 2016
82e0fe6
Merge branch 'floating_tasks' of https://github.com/CS2103AUG2016-T11…
PankajB1997 Oct 5, 2016
5c78c00
Update feedback messages for commands
PankajB1997 Oct 5, 2016
d8eb3cd
Minor updates to User Guide and feedback messages
PankajB1997 Oct 5, 2016
11e7d82
Update AboutUs.md
PankajB1997 Oct 5, 2016
0623535
Update AboutUs.md - more changes
PankajB1997 Oct 5, 2016
db1edca
Update photo
PankajB1997 Oct 5, 2016
8eb2288
Add Project Mentor to AboutUs.md
PankajB1997 Oct 5, 2016
edb555d
Update AboutUs.md
PankajB1997 Oct 5, 2016
f38a044
Update package name from 'address' to 'smartscheduler'
PankajB1997 Oct 5, 2016
3c7ddc2
change package name back to address
PankajB1997 Oct 5, 2016
c07eb50
Made revisions to commands in user guide. Update commands have not be…
dheerajaraj Oct 6, 2016
c16ffb0
Update UI
PankajB1997 Oct 6, 2016
53cc3a7
Update UI
PankajB1997 Oct 6, 2016
dbb5189
Update comment in NoteCommand.java
PankajB1997 Oct 6, 2016
b79b39a
Merge branch 'edit_userGuide' of https://github.com/CS2103AUG2016-T11…
PankajB1997 Oct 6, 2016
a7f497e
Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main
lestertj Oct 6, 2016
60dd5b8
Update User Guide and UI
PankajB1997 Oct 6, 2016
1d63d66
Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main
PankajB1997 Oct 6, 2016
9f11992
Add undo and redo commands to User Guide
PankajB1997 Oct 6, 2016
898193b
Minor markdown updates to User Guide
PankajB1997 Oct 6, 2016
6392f9b
Update User Guide
PankajB1997 Oct 6, 2016
e6ca7c5
Update Command Summary
PankajB1997 Oct 6, 2016
3e2eae8
Change Application Icon
PankajB1997 Oct 6, 2016
2a3975f
added_Priority
dheerajaraj Oct 6, 2016
dc3f288
Add delete task by name feature
PankajB1997 Oct 6, 2016
ff45e7b
Merged NoteCommand into AddCommand
fionnatong Oct 7, 2016
38950a1
Improve indentation
fionnatong Oct 7, 2016
5e54fd4
Improve indentation
fionnatong Oct 7, 2016
b5fdc6f
Changes to meet JUnit Test
fionnatong Oct 7, 2016
af6b6d2
Fixed delete_by_name
lestertj Oct 7, 2016
4bcb710
Update User Guide
PankajB1997 Oct 7, 2016
a938c8f
add_Priority_Floating_And_Normal_Tasks
dheerajaraj Oct 7, 2016
3e54f99
Add isComplete to Task
PankajB1997 Oct 7, 2016
a36fc7e
More work on delete
PankajB1997 Oct 7, 2016
072a38b
Added null checks to EndTime and StartTime
lestertj Oct 7, 2016
667a4d9
Merged AddCommand to delete_by_name branch
lestertj Oct 7, 2016
6d51536
Removed redundant function in ModelManager
lestertj Oct 7, 2016
545c7d5
Removed redundant imports
lestertj Oct 7, 2016
314f510
Renamed persons to task
lestertj Oct 7, 2016
08cf94d
Added REGEX for floating and normal tasks for AddCommand
lestertj Oct 7, 2016
916e3cd
Add Complete Command class DoneCommand.java
PankajB1997 Oct 7, 2016
e52e8d5
Merge branch 'delete_by_name' of https://github.com/CS2103AUG2016-T11…
PankajB1997 Oct 7, 2016
6a6bed8
Merge branch 'Resolved_NoteConflictsWithPriority' of https://github.c…
PankajB1997 Oct 7, 2016
c723fb3
add priority
PankajB1997 Oct 7, 2016
baff95c
Change FindCommand.java to search through tasks using keywords
PankajB1997 Oct 7, 2016
b1661d5
Change person to task
PankajB1997 Oct 7, 2016
7bc1884
Add Priority for tasks
PankajB1997 Oct 7, 2016
d563054
Change Parser for Add command, include priority in actual parameters
PankajB1997 Oct 7, 2016
19d125f
Correct regex and constraint messages for Add
PankajB1997 Oct 7, 2016
bc4fd60
Merge branch 'find_and_priority' of https://github.com/CS2103AUG2016-…
PankajB1997 Oct 7, 2016
692252e
Remove List and Select commands
PankajB1997 Oct 7, 2016
960bc40
Modify Clear Command success message
PankajB1997 Oct 7, 2016
71c3dfc
Update User Guide (update and add commands)
PankajB1997 Oct 7, 2016
acf4027
Add clear to User Guide, update command as class
PankajB1997 Oct 8, 2016
e377c65
Change Name to TaskDetails
PankajB1997 Oct 8, 2016
e769ff6
Fixed add command regex to include optional priority, optional starti…
lestertj Oct 8, 2016
ae95c87
Allowed optional start and end times, and set default priority as low
lestertj Oct 8, 2016
40b189a
Merge pull request #34 from CS2103AUG2016-T11-C1/fix_add_command_regex
lestertj Oct 8, 2016
62a77f2
Changed add regex to match user guide
lestertj Oct 8, 2016
86dcf7a
Merge pull request #35 from CS2103AUG2016-T11-C1/fix_add_command_regex
lestertj Oct 8, 2016
c36ce3c
Added local helpwindow page display
lestertj Oct 8, 2016
9c10101
Add setComplete to UniqueTaskList
lestertj Oct 8, 2016
d9b2cda
Added markTaskAsComplete to TaskList
lestertj Oct 8, 2016
694deae
Added markTaskAsComplete to ModelManager
lestertj Oct 8, 2016
01a299f
Added markTaskAsComplete to interface Model
lestertj Oct 8, 2016
db7bf7d
Changed person to task in AddCommand
lestertj Oct 8, 2016
6f2f120
Changed person to task in DeleteCommand
lestertj Oct 8, 2016
ca015e9
Changed person to task in DoneCommand
lestertj Oct 8, 2016
0a840ff
Changed person to task in FindCommand
lestertj Oct 8, 2016
85b78d0
Changed person to task in LogicManagerTest
lestertj Oct 8, 2016
b29baad
Added DoneCommand class
lestertj Oct 8, 2016
9f1627a
Added updateFilteredListToShowIncomplete to Model interface
lestertj Oct 8, 2016
cfbdeff
Added updateFilteredListToShowIncomplete
lestertj Oct 8, 2016
b00cee8
Merge pull request #36 from CS2103AUG2016-T11-C1/done_command
lestertj Oct 8, 2016
fa4369d
Fixed addCommand parsing
lestertj Oct 8, 2016
640e462
Merge pull request #37 from CS2103AUG2016-T11-C1/fix_add_command
lestertj Oct 8, 2016
61bb408
Added "\" escape char for addcommand
lestertj Oct 10, 2016
5589c4d
Merge pull request #38 from CS2103AUG2016-T11-C1/add_addcommand_escap…
lestertj Oct 10, 2016
7256987
Updated userguide
lestertj Oct 10, 2016
ab73834
Removed parser debugging statement
lestertj Oct 10, 2016
a38caa0
Merge pull request #39 from CS2103AUG2016-T11-C1/minor_userguide_updates
lestertj Oct 10, 2016
91c8ec3
Merge pull request #40 from CS2103AUG2016-T11-C1/add_help_command
lestertj Oct 10, 2016
7023770
Minor update to User Guide
PankajB1997 Oct 10, 2016
ebaee86
Refactored
lestertj Oct 10, 2016
03ba86a
Merge pull request #41 from CS2103AUG2016-T11-C1/refactor_packages
lestertj Oct 10, 2016
bbb4e61
More refactoring of class names
lestertj Oct 10, 2016
3c9c02c
Refactored "person" to "task"
lestertj Oct 10, 2016
c483dc1
Merge pull request #42 from CS2103AUG2016-T11-C1/more_name_refactoring
lestertj Oct 10, 2016
fad984c
Update userguide
fionnatong Oct 10, 2016
1ed2fa1
Update developerguide
fionnatong Oct 10, 2016
c245335
Update DeveloperGuide
fionnatong Oct 10, 2016
638a2a0
Merge pull request #43 from CS2103AUG2016-T11-C1/minor_updates
fionnatong Oct 10, 2016
f2bfdc2
Modify message displayed for successful task addition
PankajB1997 Oct 10, 2016
ba7ca47
Update README.md
PankajB1997 Oct 10, 2016
c168f71
Update User Guide based on TA's recommendation
PankajB1997 Oct 10, 2016
23ae972
Minor Update to UG
PankajB1997 Oct 10, 2016
5d7edb5
Update Show command in User Guide
PankajB1997 Oct 10, 2016
f813ab8
Minor update to User Guide
PankajB1997 Oct 10, 2016
715f20e
Minor update to User Guide
PankajB1997 Oct 10, 2016
5dc297d
Add UpdateCommand.java
PankajB1997 Oct 10, 2016
b7632b4
Change getName() to getTaskDetails() and fix regressions
PankajB1997 Oct 10, 2016
0d93163
Complete UpdateCommand (regex not working, to be fixed)
PankajB1997 Oct 10, 2016
772bf9f
Update find command parser to look for tasks containing the entered word
PankajB1997 Oct 11, 2016
cdc1ac8
Update Parser for Done and Delete commands
PankajB1997 Oct 11, 2016
102836d
Fixed EndTime and StartTime validation regex
lestertj Oct 11, 2016
8d9f802
Fixed addCommand tests
lestertj Oct 11, 2016
d438992
Merge pull request #45 from CS2103AUG2016-T11-C1/fix_time_validation_…
lestertj Oct 11, 2016
57df1a4
Merge branch 'master' into fix_add_command_test
lestertj Oct 11, 2016
f5c7b02
Merge pull request #46 from CS2103AUG2016-T11-C1/fix_add_command_test
lestertj Oct 11, 2016
94aeed8
Fixed add parser
lestertj Oct 11, 2016
362d7f6
Merge pull request #47 from CS2103AUG2016-T11-C1/fix_add_parser
lestertj Oct 11, 2016
b7e3374
Refactored Test from addressbook to tasklist
lestertj Oct 11, 2016
37196bb
Merge pull request #48 from CS2103AUG2016-T11-C1/refactor_test
lestertj Oct 11, 2016
194b982
Modify regex for update
PankajB1997 Oct 11, 2016
b80dd50
Fixed update regex
lestertj Oct 11, 2016
3296f1c
Fixed update_command regex
lestertj Oct 11, 2016
e0ed17a
Introduce ShowCommand
fionnatong Oct 11, 2016
1c2a83e
Update Parser for ShowCommand
fionnatong Oct 11, 2016
75dca01
Update ModelManager for ShowCommand
fionnatong Oct 11, 2016
139bdfe
Show tasks based on priority
fionnatong Oct 11, 2016
1de17e0
Slight changes to ShowCommand
fionnatong Oct 11, 2016
a65e4e7
Add all, complete and p/ categories for ShowCommand
fionnatong Oct 11, 2016
2a2e165
Add incomplete category to ShowCommand
fionnatong Oct 11, 2016
5af8f11
Improve indentation
fionnatong Oct 11, 2016
ee21d17
Add test cases for ShowCommand
fionnatong Oct 11, 2016
e075da8
Add incomplete category into showcommand
fionnatong Oct 11, 2016
6f8ef0e
update showcommand
fionnatong Oct 11, 2016
33b09f0
Update showcommand
fionnatong Oct 12, 2016
cee15bd
Refactor Person to Task and AddressBook to TaskList
PankajB1997 Oct 12, 2016
507488c
Allow case-insensitive matching of task keywords
PankajB1997 Oct 12, 2016
6fb46cc
Merge pull request #51 from CS2103AUG2016-T11-C1/refactor_names
lestertj Oct 12, 2016
bb9f981
Update test cases for FindCommand, refactor persons to tasks
PankajB1997 Oct 12, 2016
156cac9
Merge branch 'refactor_names' of https://github.com/CS2103AUG2016-T11…
PankajB1997 Oct 12, 2016
95fc6af
Added donecommand tests
lestertj Oct 12, 2016
390e635
Merge pull request #53 from CS2103AUG2016-T11-C1/done_command_test
lestertj Oct 12, 2016
354a90a
Added start_time_parser
lestertj Oct 12, 2016
61d9fe9
Merge pull request #54 from CS2103AUG2016-T11-C1/Add_start_time_parser
lestertj Oct 12, 2016
bd8e00b
Add tests for Update command
PankajB1997 Oct 12, 2016
9c7be1d
Add test cases for delete, minor refactoring
PankajB1997 Oct 12, 2016
56d9662
Merge pull request #52 from CS2103AUG2016-T11-C1/refactor_names
PankajB1997 Oct 12, 2016
4095e74
Merge pull request #55 from CS2103AUG2016-T11-C1/test_update_command
PankajB1997 Oct 12, 2016
eb888a3
Merge pull request #56 from CS2103AUG2016-T11-C1/test_delete
PankajB1997 Oct 12, 2016
7e3fa86
Added NLP parsing to startime
lestertj Oct 12, 2016
6b06822
Added NLP parsing to endtime
lestertj Oct 12, 2016
cc4dad0
Changed task storage format
lestertj Oct 12, 2016
23f6e05
Changed taskcard display
lestertj Oct 12, 2016
d59a53e
included nattytime parser
lestertj Oct 12, 2016
b118c3f
Fixed personcardhandle
lestertj Oct 12, 2016
97a047f
Fixed testtask
lestertj Oct 12, 2016
0273a2a
Merge pull request #57 from CS2103AUG2016-T11-C1/add_time_parsers
lestertj Oct 12, 2016
f48509f
Refactor person to task in ShowCommand
PankajB1997 Oct 12, 2016
6d654c3
Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main
PankajB1997 Oct 12, 2016
121adf0
Corrected prepareupdate
lestertj Oct 12, 2016
a01efc4
Corrected personcardhandle
lestertj Oct 12, 2016
f623725
Corrected test data
lestertj Oct 12, 2016
e3fa8e4
Corrected test data
lestertj Oct 12, 2016
9cc32af
Merge branch 'master' into add_time_parsers
lestertj Oct 12, 2016
ab0473e
Merge pull request #58 from CS2103AUG2016-T11-C1/add_time_parsers
lestertj Oct 12, 2016
6510704
Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main
PankajB1997 Oct 12, 2016
92799d5
Change package of DoneCommandTest.java
PankajB1997 Oct 12, 2016
27eb75e
Removed debugging statements
lestertj Oct 13, 2016
56470a0
Added done gui test
lestertj Oct 13, 2016
91ec9cc
Merge pull request #59 from CS2103AUG2016-T11-C1/add_done_gui_test
lestertj Oct 13, 2016
8ee80b0
Fix ShowCommandTest
PankajB1997 Oct 13, 2016
58efcbd
Added completion status icon to UI
lestertj Oct 13, 2016
24755a6
Merge pull request #61 from CS2103AUG2016-T11-C1/ui_add_status_icon
lestertj Oct 13, 2016
9eb1154
Added UI icons for completion status
lestertj Oct 13, 2016
604a5ac
Merge pull request #62 from CS2103AUG2016-T11-C1/ui_add_status_icon
lestertj Oct 13, 2016
ffafcb9
Added TimePreparser
lestertj Oct 13, 2016
f3c5284
Merge pull request #63 from CS2103AUG2016-T11-C1/rearranged_date_format
lestertj Oct 13, 2016
edf6765
Update ReadMe.md
PankajB1997 Oct 13, 2016
d9f1205
Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main
PankajB1997 Oct 13, 2016
a41836f
Fixed addCommand escape character
lestertj Oct 13, 2016
649d60e
Added escape parser for update
lestertj Oct 13, 2016
cbe6ccf
Merge pull request #64 from CS2103AUG2016-T11-C1/fix_add_command_escape
lestertj Oct 13, 2016
9ab94e3
fixed date displayed
dheerajaraj Oct 13, 2016
45bd48e
changed from 24 hrs to a.m and p.m
dheerajaraj Oct 13, 2016
f11d6c1
made the relevant changes...
dheerajaraj Oct 13, 2016
4451ce2
fixed errors on Endtime and startTime
dheerajaraj Oct 13, 2016
c1f7659
fixed parser unable to accept forward slash format for dates
dheerajaraj Oct 14, 2016
8ee49af
foxed forward slash
dheerajaraj Oct 14, 2016
05ec286
fixed and tested cases
dheerajaraj Oct 14, 2016
dea0807
Disable task selection browserloading
lestertj Oct 14, 2016
646cd71
Changed browser panel to category panel
lestertj Oct 14, 2016
6122164
Rearranged elements
lestertj Oct 14, 2016
05fe430
Created new categorypanel fxml
lestertj Oct 14, 2016
95e3fe5
Created new categorypanel class
lestertj Oct 14, 2016
f61fd26
Merge pull request #77 from CS2103AUG2016-T11-C1/rearrange_ui
lestertj Oct 14, 2016
7d4f2fc
corrected the format of display results
dheerajaraj Oct 14, 2016
a3163fe
resurrected toString() and finalised format
dheerajaraj Oct 14, 2016
547d137
Merge branch 'master' into dateErrorCorrection
lestertj Oct 14, 2016
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
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>addressbook-level4</name>
<name>main</name>
<comment>Project addressbook-level4 created by Buildship.</comment>
<projects>
</projects>
Expand Down
19 changes: 8 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
[![Build Status](https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master)](https://travis-ci.org/se-edu/addressbook-level4)
[![Coverage Status](https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master)](https://coveralls.io/github/se-edu/addressbook-level4?branch=master)
[![Build Status](https://travis-ci.org/CS2103AUG2016-T11-C1/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-T11-C1/main)
[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-T11-C1/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-T11-C1/main?branch=master)

# Address Book (Level 4)
# Smart Scheduler

<img src="docs/images/Ui.png" width="600"><br>

* 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 [level 3](https://github.com/se-edu/addressbook-level3):
* This is a desktop task manager application, with most user interactions happening 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.
* Advanced Features:
* 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.
Expand All @@ -29,6 +26,6 @@

* Some parts of this sample application were inspired by the excellent
[Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*.

* We also acknowledge the original source of the code i.e. the SE-EDU initiative at https://github.com/se-edu/

#### Licence : [MIT](LICENSE)
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ allprojects {
compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion"
compile "com.google.guava:guava:$guavaVersion"
compile group: 'com.joestelmach', name: 'natty', version: '0.12'

testCompile "junit:junit:$junitVersion"
testCompile "org.testfx:testfx-core:$testFxVersion"
Expand Down
64 changes: 34 additions & 30 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,52 +1,56 @@
# About Us

We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).
We are a group of highly motivated and hardworking students working on our CS2103T project.

## Project Team

#### [Damith C. Rajapakse](http://www.comp.nus.edu.sg/~damithch) <br>
<img src="images/DamithRajapakse.jpg" width="150"><br>
**Role**: Project Advisor
#### [Pankaj Bhootra](https://github.com/PankajB1997)

-----
<img src="images/PankajBhootra.JPG" width="150">

#### [Joshua Lee](http://github.com/lejolly)
<img src="images/JoshuaLee.jpg" width="150"><br>
Role: Developer <br>
Responsibilities: UI
1. *Team Lead* for the Project.
2. Programming Experience: 4 years of Programming in Java, familiar with SQL and other languages such as C, C# and Python.
3. Roles and Responsibilities: Incharge of Logic component, Documentation, Deliverables and Deadlines, and Scheduling and Tracking Project Tasks.
4. Tool Expert: JavaFX and Scene Builder.

-----

#### [Leow Yijin](http://github.com/yijinl)
<img src="images/LeowYijin.jpg" width="150"><br>
Role: Developer <br>
Responsibilities: Data
#### [R Dheeraj](https://github.com/dheerajaraj)

<img src="images/RDheeraj.jpg" width="150">

1. Programming Experience: Java (through CS1020 and CS2103T), PHP (through Orbital), HTML (through Orbital) and MySQL (through Orbital).
2. Roles and Responsibilities: Incharge of Input Parsing and Maintaining Code Quality.
3. Tool Expert: All the relevant Java APIs (Stream API for Functional Programming, Optional, Collections, etc.)

-----

#### [Martin Choo](http://github.com/m133225)
<img src="images/MartinChoo.jpg" width="150"><br>
Role: Developer <br>
Responsibilities: Dev Ops
#### [Fionna Tong](https://github.com/fionnatong)

<img src="images/FionnaTong.jpeg" width="150">

1. Programming Experience: Familiar with Java, Python, C and C++ languages, 4 years' experience in HTML and CSS
2. Roles and Responsibilities: Incharge of UI and Testing.
3. Tool Expert: GitHub and SourceTree.

-----

#### [Thien Nguyen](https://github.com/ndt93)
Role: Developer <br>
Responsibilities: Threading

-----
#### [Lester Tan](https://github.com/lestertj)

#### [You Liang](http://github.com/yl-coder)
<img src="images/YouLiang.jpg" width="150"><br>
Role: Developer <br>
Responsibilities: UI
<img src="images/LesterTan.jpg" width="150">

1. Programming Experience: Familiar with Java, Python, C++, C and PHP. 1 Year experience in Programming.
2. Roles and Responsibilities: Incharge of Storage and Integration.
3. Tool Expert: Eclipse.


## Project Mentor

-----
#### [Nirandika Wanigasekara](https://github.com/nirandiw)

<img src="images/ProjectMentor.JPG" width="150">


# Contributors

We welcome contributions. See [Contact Us](ContactUs.md) page for more info.

* [Akshay Narayan](https://github.com/se-edu/addressbook-level4/pulls?q=is%3Apr+author%3Aokkhoy)
* [Sam Yong](https://github.com/se-edu/addressbook-level4/pulls?q=is%3Apr+author%3Amauris)
4 changes: 2 additions & 2 deletions docs/ContactUs.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Contact Us

* **Bug reports, Suggestions** : Post in our [issue tracker](https://github.com/se-edu/addressbook-level4/issues)
* **Bug reports, Suggestions** : Post in our [issue tracker](https://github.com/CS2103AUG2016-T11-C1/main/issues)
if you noticed bugs or have suggestions on how to improve.

* **Contributing** : We welcome pull requests. Follow the process described [here](https://github.com/oss-generic/process)

* **Email us** : You can also reach us at `damith [at] comp.nus.edu.sg`
* **Email us** : You can also reach us at `pankajbhootra@gmail.com`
Loading