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

[T7][T14-C2] #109

Open
wants to merge 394 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
394 commits
Select commit Hold shift + click to select a range
922f9d5
Update UserGuide.md
qhng Oct 18, 2016
3683aa5
Update UserGuide.md
qhng Oct 18, 2016
9778146
Update DeveloperGuide.md
qhng Oct 18, 2016
4e95bf5
Update DeveloperGuide.md
qhng Oct 18, 2016
8c2d116
Update gradle to reflect new package name.
qhng Oct 18, 2016
784a178
Update DeveloperGuide.md
qhng Oct 18, 2016
85ade9c
Merge pull request #61 from CS2103AUG2016-T14-C2/V0.3-Update-Gradle
qhng Oct 18, 2016
ca0b76b
Remove Unit Test for '+' signed indices. Parser has no support yet.
qhng Oct 18, 2016
ac64049
Merge pull request #62 from CS2103AUG2016-T14-C2/V0.3-Update-SUT
qhng Oct 18, 2016
ce54074
Add clarity to add command in UserGuide.md
e0003801 Oct 19, 2016
a41a012
Remove select and start/end time options for add and modify command i…
e0003801 Oct 19, 2016
e9b9073
Merge pull request #63 from CS2103AUG2016-T14-C2/V0.3-Update-Docs
qhng Oct 20, 2016
0bc2ad0
Merge pull request #64 from CS2103AUG2016-T14-C2/V0.3
qhng Oct 20, 2016
b722c1c
Refactor and clean code base
qhng Oct 21, 2016
4275e33
Refactor TaskFieldParser,IndexParser,FindCommandParser subparsing met…
e0003801 Oct 21, 2016
9d448c2
Merge pull request #71 from CS2103AUG2016-T14-C2/V0.4-Refactor-And-Cl…
qhng Oct 21, 2016
55844cf
Merge branch 'V0.4' of https://github.com/CS2103AUG2016-T14-C2/main i…
e0003801 Oct 21, 2016
5247497
Refactor Command abstract class setData() method to setModel().
e0003801 Oct 21, 2016
0fb08ec
Add parsing preprocessing handling methods in Logic interface and Log…
e0003801 Oct 21, 2016
df09c0a
Add AliasSymbol as the model data for alias symbols
e0003801 Oct 22, 2016
64fe1ab
Add UnaliasCommandParser to parse unalias command
e0003801 Oct 22, 2016
ea16c55
Add canParseHeader() method in Logic and LogicManager to support quer…
e0003801 Oct 22, 2016
aad8465
Merge pull request #74 from CS2103AUG2016-T14-C2/V0.4-Alias
e0003801 Oct 22, 2016
2641c57
Modify to MasterParser.registerCommandParser() to return boolean if r…
e0003801 Oct 23, 2016
35217da
Established structure for undo and redo, missing inverse commands for…
tet54 Oct 24, 2016
242f09c
Undo for Add Command implemented
tet54 Oct 24, 2016
82f3acf
Implemented Undo for AliasCommand
tet54 Oct 24, 2016
8ca6b2e
Implemented redo for Delete and undo for Unalias
tet54 Oct 24, 2016
f9dd4e4
Reflect actual outputs to match expected test cases.
qhng Oct 24, 2016
8569ef3
Implemented redo for Alias, and undo for Modify
tet54 Oct 24, 2016
0551581
Merge pull request #77 from CS2103AUG2016-T14-C2/V0.4-Fix-SUT
qhng Oct 24, 2016
84a28ef
Implemented undo and redo for multiple index delete
tet54 Oct 24, 2016
802a4ce
Implemented undo and redo for clear and delete commands
tet54 Oct 24, 2016
dbb043f
Updated command methods
tet54 Oct 24, 2016
19cf4b1
Implemented Mark Command
tet54 Oct 24, 2016
3eefdcd
Updated mark command
tet54 Oct 24, 2016
ae0a954
Implemented unmark command
tet54 Oct 24, 2016
31d7ba3
Merge remote-tracking branch 'origin/V0.4' into V0.4-Mark-Unmark
tet54 Oct 25, 2016
56a0538
Remove CommandModels. Unnecessary coupling removed.
qhng Oct 25, 2016
23a7d3d
Merge pull request #78 from CS2103AUG2016-T14-C2/V0.4-Remove-CommandM…
qhng Oct 25, 2016
e20948d
Update Architecture diagram
e0003801 Oct 26, 2016
aaf4d79
Update LogicClassDiagram, fix arrow in Architecture Diagram
e0003801 Oct 26, 2016
614db60
Update DeletePersonSdForLogic.png
e0003801 Oct 26, 2016
3191f50
Add * quantifier to CommandParser interface for LogicClassDiagram
e0003801 Oct 26, 2016
c54fcbc
Fix default values not being used for Task
qhng Oct 26, 2016
43c5e9c
Update SUT components to start off with default values specified in Task
qhng Oct 26, 2016
0b87be0
Implement smart defaults for date
qhng Oct 26, 2016
53bbd1c
Merge pull request #83 from CS2103AUG2016-T14-C2/V0.4-Implement-Smart…
qhng Oct 26, 2016
23f2a3e
Implement search by category
qhng Oct 26, 2016
f4e2b55
Merge pull request #84 from CS2103AUG2016-T14-C2/V0.4-Implement-Searc…
qhng Oct 26, 2016
3a92dc3
Update UserGuide.md
qhng Oct 26, 2016
69a578c
Revert "Update UserGuide.md"
qhng Oct 26, 2016
a5dad2c
Update UserGuide.md
qhng Oct 26, 2016
aaae65f
Update UserGuide.md
qhng Oct 26, 2016
48dde8e
Update UserGuide.md
qhng Oct 26, 2016
3c77917
Update UserGuide.md
qhng Oct 26, 2016
8bc1a72
Update UserGuide.md
qhng Oct 26, 2016
fcfa44d
Update DeveloperGuide.md
qhng Oct 26, 2016
c00e3e6
Update diagrams
qhng Oct 26, 2016
5f343bd
Update diagrams
qhng Oct 26, 2016
e8f4f1a
Updated Diagrams powerpoint file
tet54 Oct 26, 2016
07483c7
Updated developer guide with undo and redo use cases + minor format u…
tet54 Oct 26, 2016
1ff858b
Update Architecture.png and LogicClassDiagram.png
e0003801 Oct 26, 2016
9f44ee6
Update Diagrams
e0003801 Oct 26, 2016
4c637f1
Update Architecture.png and LogicClassDiagram.png
e0003801 Oct 26, 2016
fb06eac
Update LogicClassDiagram.png
e0003801 Oct 26, 2016
31bcda8
Deleted
e0003801 Oct 26, 2016
e83270f
Add LogicClassDiagram
e0003801 Oct 26, 2016
e760248
Collate codes
qhng Oct 26, 2016
c16278e
Merge pull request #88 from CS2103AUG2016-T14-C2/V0.4-Qh-Collate
qhng Oct 26, 2016
ecfaeda
Collate update
qhng Oct 26, 2016
a88916b
Merge pull request #89 from CS2103AUG2016-T14-C2/V0.4-Qh-Collate
qhng Oct 26, 2016
b426ff4
Add additional product survey
e0003801 Oct 26, 2016
570ccb6
Update DeveloperGuide.md
qhng Oct 26, 2016
a37fa41
Update DeveloperGuide.md
qhng Oct 26, 2016
6646444
Revert "Add additional product survey"
qhng Oct 26, 2016
8063708
Add //@@author
e0003801 Oct 26, 2016
c13abd2
Update collate
qhng Oct 26, 2016
2c0982f
Temporarily Fixes #82
e0003801 Oct 26, 2016
bf1cf2e
Merge pull request #90 from CS2103AUG2016-T14-C2/V0.4-Qh-Collate
e0003801 Oct 26, 2016
ecf5636
Fix modify command parser not accepting empty values
e0003801 Oct 26, 2016
935410b
Merge branch 'V0.4' of https://github.com/CS2103AUG2016-T14-C2/main i…
e0003801 Oct 26, 2016
0d0d0e8
Fix removing fields that were setted previously and needs to be "unset"
qhng Oct 26, 2016
6df335e
Update unknown command to show help message. Update SUT to reflect ch…
qhng Oct 26, 2016
826ec60
Merge pull request #91 from CS2103AUG2016-T14-C2/V0.4-Modify-Remove
qhng Oct 26, 2016
56c40d7
Merge pull request #92 from CS2103AUG2016-T14-C2/V0.4
qhng Oct 26, 2016
3f189cf
Updated with @@author
tet54 Oct 26, 2016
82129e3
Update collate
qhng Oct 27, 2016
c200ddb
Merge pull request #93 from CS2103AUG2016-T14-C2/V0.4
qhng Oct 27, 2016
675e78f
Update AboutUs.md
qhng Oct 27, 2016
40b99a9
Update AboutUs.md
qhng Oct 27, 2016
b31de34
Add ParserClassDiagram, Revert LogicClassDiagram
e0003801 Oct 27, 2016
54b8bf3
Update Diagrams
e0003801 Oct 27, 2016
3fc8e06
Update UserGuide.md
qhng Oct 27, 2016
1c5e25f
Update DeveloperGuide.md
qhng Oct 27, 2016
64738fc
Update DeveloperGuide.md
e0003801 Oct 27, 2016
054fc30
Update AboutUs
e0003801 Oct 27, 2016
8ce16d4
Update AboutUs
e0003801 Oct 27, 2016
11cbfc4
Update DeveloperGuide
e0003801 Oct 27, 2016
c66b8e1
Add ParserClassDiagram, Revert LogicClassDiagram
e0003801 Oct 27, 2016
04fcd2b
Update Diagrams
e0003801 Oct 27, 2016
a5c8358
Update DeveloperGuide
e0003801 Oct 27, 2016
5ca47e4
Update AboutUs
e0003801 Oct 27, 2016
2c4c659
Update AboutUs
e0003801 Oct 27, 2016
bde273d
Update UserGuide
e0003801 Oct 27, 2016
e350192
Update UserGuide
e0003801 Oct 27, 2016
d4dea14
Update UserGuide.md
e0003801 Oct 27, 2016
c983765
Update UserGuide.md
e0003801 Oct 27, 2016
be2f914
Revert "Add ParserClassDiagram, Revert LogicClassDiagram"
qhng Oct 27, 2016
020c8f3
Revert "Update Diagrams"
qhng Oct 27, 2016
29e6901
Revert "Update DeveloperGuide.md"
qhng Oct 27, 2016
2f9dfe4
Update docs with tags
tet54 Oct 27, 2016
a5e2404
Update collate docs
qhng Oct 28, 2016
e41dde8
Merge pull request #94 from CS2103AUG2016-T14-C2/master-update-docs
qhng Oct 28, 2016
6b4d813
Fix Task.toString() displaying fields that are null.
qhng Oct 28, 2016
6118ab7
Implement add/modify jumping directly to the task affected.
qhng Oct 28, 2016
fe1356b
Fix default list being sorted by due date
qhng Oct 28, 2016
3cb0ad8
Fix invalid assert with assumption that GUI is present causing the SU…
qhng Oct 28, 2016
68aeeb2
Merge pull request #101 from CS2103AUG2016-T14-C2/V0.5rc-Implement-Ju…
qhng Oct 28, 2016
9e75b02
Update UserGuide.md for recurring tasks
qhng Oct 29, 2016
e00b458
Implement recurring tasks
qhng Oct 29, 2016
a73a3cc
Fix bug for add/modify not jumping to list item if the first item on …
qhng Oct 29, 2016
90e3a39
Update SUT to fit requirements for the task object.
qhng Oct 29, 2016
9675f25
Merge pull request #104 from CS2103AUG2016-T14-C2/V0.5rc-Implement-Re…
qhng Oct 29, 2016
7b44086
Add more data to UI for test verification
qhng Oct 29, 2016
6e22ca9
Increase test coverage
qhng Oct 29, 2016
bb2137b
Include collate tool
qhng Oct 29, 2016
6a79168
Update collates
qhng Oct 29, 2016
ecf942d
Merge pull request #106 from CS2103AUG2016-T14-C2/V0.5rc-Increase-Tes…
qhng Oct 29, 2016
bca0b98
Fix locale issue for SUT
qhng Oct 29, 2016
e41c89e
Fix locale defaults in SUT
qhng Oct 29, 2016
b16d9a7
Remove platform specific UI output matching
qhng Oct 29, 2016
518667b
Merge pull request #108 from CS2103AUG2016-T14-C2/V0.5rc-Increase-Tes…
qhng Oct 29, 2016
9bcb28c
Fix tokens that directly follows switches requiring a space to be rec…
e0003801 Oct 30, 2016
a927598
Refactor Person to Task
qhng Nov 1, 2016
d1c0dec
Refactor Person to Task
qhng Nov 1, 2016
f2fec67
Refactor Person to Task
qhng Nov 1, 2016
b8a3844
Implement list alias
qhng Nov 1, 2016
4b8552d
Merge pull request #109 from CS2103AUG2016-T14-C2/V0.5rc-Parser-Refin…
e0003801 Nov 1, 2016
1758378
Move ListType enum to seedu/savvytasker/model package
e0003801 Nov 1, 2016
2808d39
Fix AliasCommandParser and UnaliasCommandParser being case sensitive.
e0003801 Nov 1, 2016
69a3b24
Make AliasSymbolChanged members private and provided public getters
e0003801 Nov 1, 2016
96992c3
Add @@author in StorageCommandParser
e0003801 Nov 1, 2016
01e6e91
Implement list alias
qhng Nov 1, 2016
8734b2c
Refactor ParserTest methods to follow convention
e0003801 Nov 1, 2016
cfa6a08
Merge branch 'V0.5rc-List-Alias' of https://github.com/CS2103AUG2016-…
e0003801 Nov 1, 2016
3ac53a1
Fix StorageCommandParser not throwing when no path has been given
e0003801 Nov 1, 2016
cf33f6b
Merge branch 'V0.5rc' of https://github.com/CS2103AUG2016-T14-C2/main…
e0003801 Nov 1, 2016
3961091
Change ListType.AliasKeywords to Alias
e0003801 Nov 1, 2016
e97355a
Modify IncorrectCommand to display resolved text
e0003801 Nov 1, 2016
97236c5
Fixed SUT fails after feature introduction
qhng Nov 2, 2016
87734d8
Fix NPE when tests are run without UI.
qhng Nov 2, 2016
9bd629d
Merge pull request #116 from CS2103AUG2016-T14-C2/V0.5rc-List-Alias
qhng Nov 2, 2016
c2232a7
Implement change storage and refactor codes
qhng Nov 2, 2016
99d547f
Add @@author tags
qhng Nov 2, 2016
17613d2
Minor changes
tet54 Nov 2, 2016
f27927f
Update method comments
qhng Nov 2, 2016
cac7f0a
Removed coupling with UI. Used event driven model to trigger UI changes.
qhng Nov 2, 2016
ff89cfd
Update UserGuide.md
qhng Nov 2, 2016
1edba0e
Update UserGuide.md
qhng Nov 2, 2016
032fd78
Update DeveloperGuide.md
qhng Nov 2, 2016
3684404
Update DeveloperGuide.md
qhng Nov 2, 2016
bbbd343
Update DeveloperGuide.md
qhng Nov 2, 2016
6874293
Merge pull request #117 from CS2103AUG2016-T14-C2/V0.5-mark-unmark-mi…
qhng Nov 2, 2016
2d15311
Set up modelmanager to generate floating, overdue, daily and upcoming…
ruiwen905 Nov 2, 2016
8efe115
Edit naming typo
ruiwen905 Nov 2, 2016
28ed6d8
Set up dailyList controller
ruiwen905 Nov 2, 2016
5624ef3
Generate overdue, floating, daily and upcoming list in model manager …
ruiwen905 Nov 2, 2016
9a5add9
Description of mainWindow.java and edit mainWindow.fxml
ruiwen905 Nov 2, 2016
8ee671b
set up daily panel for mainWindow
ruiwen905 Nov 2, 2016
57e0984
Save Command and Keyboard Shortcuts and Task Card Colour Code accordi…
ruiwen905 Nov 2, 2016
ff51186
Revert "Save Command and Keyboard Shortcuts and Task Card Colour Code…
qhng Nov 3, 2016
6d20f26
Revert "set up daily panel for mainWindow"
qhng Nov 3, 2016
5e1fdcf
Revert "Description of mainWindow.java and edit mainWindow.fxml"
qhng Nov 3, 2016
6fe53d1
Revert "Generate overdue, floating, daily and upcoming list in model …
qhng Nov 3, 2016
39612a2
Revert "Set up dailyList controller"
qhng Nov 3, 2016
06da366
Revert "Edit naming typo"
qhng Nov 3, 2016
85050da
Revert "Set up modelmanager to generate floating, overdue, daily and …
qhng Nov 3, 2016
c19b73f
Merge pull request #121 from CS2103AUG2016-T14-C2/V0.5rc-List-Alias
qhng Nov 3, 2016
951aaf8
Merge pull request #122 from CS2103AUG2016-T14-C2/V0.5rc-Update-Docs
qhng Nov 3, 2016
9239dfc
Update collate
qhng Nov 3, 2016
d5b084d
Merge pull request #123 from CS2103AUG2016-T14-C2/V0.5rc-Implement-Ch…
qhng Nov 3, 2016
2ba8cef
Update collates
qhng Nov 3, 2016
278752f
Merge pull request #124 from CS2103AUG2016-T14-C2/V0.5rc
qhng Nov 3, 2016
f6115e2
Revert "Revert "Set up modelmanager to generate floating, overdue, da…
qhng Nov 3, 2016
abf4967
Revert "Revert "Edit naming typo""
qhng Nov 3, 2016
dd80095
Revert "Revert "Set up dailyList controller""
qhng Nov 3, 2016
7e03738
Take theirs
qhng Nov 3, 2016
72feb4e
Revert "Revert "Description of mainWindow.java and edit mainWindow.fx…
qhng Nov 3, 2016
0f91d45
Revert "Revert "set up daily panel for mainWindow""
qhng Nov 3, 2016
9fdd86d
no message
qhng Nov 3, 2016
1b18552
Integration round 1
qhng Nov 3, 2016
928d4ab
Integration round 1
qhng Nov 3, 2016
6696ff6
Fix SUT. Removed menu feature.
qhng Nov 5, 2016
408ed33
Fixed SUT. Removed clearing command box text on invalid command
qhng Nov 5, 2016
619f04f
Merge pull request #125 from CS2103AUG2016-T14-C2/V0.5rc-Ruiwen
qhng Nov 5, 2016
877aa8a
Cleaned up codes
qhng Nov 5, 2016
e0aeeac
Reflected changes according to codacy.
qhng Nov 5, 2016
7af27bb
Merge pull request #126 from CS2103AUG2016-T14-C2/V0.5-Qh-Improve-Cod…
qhng Nov 5, 2016
9a4cc5e
Fix code style consistency for single line if to follow convention
e0003801 Nov 6, 2016
44a8ec3
Update docs, minor fixes
e0003801 Nov 6, 2016
a6ba592
add image icon, SLAP keyboard shortcuts and add list priority and lis…
ruiwen905 Nov 6, 2016
7e5043f
Edit UI: remove overdue panel and adjust weekly view panel
ruiwen905 Nov 6, 2016
d2a0cb7
Added new tests for undo and redo
tet54 Nov 6, 2016
110e1e9
Merge branch 'V0.5' of https://github.com/CS2103AUG2016-T14-C2/main i…
tet54 Nov 6, 2016
ec0a76f
remove overdue list and change UI
ruiwen905 Nov 7, 2016
08abb4b
keyboard left and right shortcuts to change week selected in daily view
ruiwen905 Nov 7, 2016
0b0cf56
task card timestamp and remove overdue files
ruiwen905 Nov 7, 2016
ec3502b
Merge pull request #127 from CS2103AUG2016-T14-C2/V0.5-Limited-UndoRedo
qhng Nov 7, 2016
04f0751
remove priority and archived details in task card and add overdue ima…
ruiwen905 Nov 7, 2016
095e74e
Merge pull request #128 from CS2103AUG2016-T14-C2/V0.5
qhng Nov 7, 2016
ac0b32f
toggle esc to show cheatsheet
ruiwen905 Nov 7, 2016
47f40d6
Update README.md
qhng Nov 7, 2016
2decef5
StorageCommand Test and Docs update
ruiwen905 Nov 7, 2016
8809de4
Merge pull request #129 from CS2103AUG2016-T14-C2/V0.5rc-Ruiwen
qhng Nov 7, 2016
4c44077
UI screenshot
ruiwen905 Nov 7, 2016
1c01061
Fix lost import after merging
qhng Nov 7, 2016
464864b
Fix Help window SUT failing.
qhng Nov 7, 2016
8dca765
Fix hide index on sublists
qhng Nov 7, 2016
8b74ffb
update left right to ctrl-left and ctrl-right
ruiwen905 Nov 7, 2016
dbba5e5
Fix empty list showing a seemingly blank left panel
qhng Nov 7, 2016
15fda63
Merge branch 'V0.5rc-Ruiwen' of https://github.com/CS2103AUG2016-T14-…
qhng Nov 7, 2016
a71ec31
Update README.md
qhng Nov 7, 2016
8cde8f7
Update AboutUs.md
qhng Nov 7, 2016
24cc2b7
Update AboutUs.md
qhng Nov 7, 2016
3044c3b
Merge pull request #130 from CS2103AUG2016-T14-C2/V0.5-Integration-Te…
qhng Nov 7, 2016
7e5f6b1
Update UserGuide.md
qhng Nov 7, 2016
74cd929
Update UserGuide.md
qhng Nov 7, 2016
2710fc3
Update UserGuide.md
qhng Nov 7, 2016
5fda247
Update UserGuide.md
qhng Nov 7, 2016
f2cac1e
Update UserGuide.md
qhng Nov 7, 2016
65fdd0c
Collate updates
qhng Nov 7, 2016
095d1c8
Fix UI not displaying correctly
qhng Nov 7, 2016
180dd16
Update Ui screenshot
qhng Nov 7, 2016
84ea246
Merge pull request #131 from CS2103AUG2016-T14-C2/V0.5
qhng Nov 7, 2016
37d7b2f
Update UserGuide.md
qhng Nov 7, 2016
2a8d5aa
Added SampleData.xml and TestScript.md
tet54 Nov 7, 2016
e572b09
Merge branch 'master' of https://github.com/CS2103AUG2016-T14-C2/main…
tet54 Nov 7, 2016
a4399dc
Added SampleData.xml and TestScript.md
tet54 Nov 7, 2016
bf18b24
Changed formatting + location of files
tet54 Nov 7, 2016
dc7faeb
changed format
tet54 Nov 7, 2016
3992fb2
Update TestScript.md
qhng Nov 7, 2016
bdcc5cc
Update TestScript.md
qhng Nov 7, 2016
2668119
Update TestScript.md
qhng Nov 7, 2016
f162eaa
Merge pull request #132 from CS2103AUG2016-T14-C2/V0.5
qhng Nov 7, 2016
4a261ec
Update TestScript.md
qhng Nov 7, 2016
6354e75
Update TestScript.md
qhng Nov 7, 2016
724f67e
Update TestScript.md
qhng Nov 7, 2016
0ae8b05
Update TestScript.md
qhng Nov 7, 2016
4b0e71c
Update TestScript.md
qhng Nov 7, 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
1 change: 0 additions & 1 deletion .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
build.commands=org.eclipse.jdt.core.javabuilder
connection.arguments=
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.gradle.user.home=null
connection.java.home=null
connection.jvm.arguments=
connection.project.dir=
Expand Down
Binary file added Collate-TUI.jar
Binary file not shown.
19 changes: 7 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
[![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-T14-C2/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-T14-C2/main)
[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-T14-C2/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-T14-C2/main?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/91232e72b4c645dc9d988942651ca906)](https://www.codacy.com/app/xefrog/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CS2103AUG2016-T14-C2/main&amp;utm_campaign=Badge_Grade)

# Address Book (Level 4)
# Savvy Tasker

<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
* This is a desktop Task Tracker 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):
* 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.


#### Site Map
Expand All @@ -29,6 +22,8 @@

* 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*.
* This is a sample project created by [SE-EDU](https://githubcom/se-edu/) initiative.
* [Natty](http://natty.joestelmach.com/) for parsing user input dates


#### Licence : [MIT](LICENSE)
Empty file added SampleData.xml
Empty file.
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ allprojects {
junitVersion = '4.12'
testFxVersion = '4.0.+'
monocleVersion = '1.8.0_20'
nattyVersion = '0.11'

libDir = 'lib'
}
Expand All @@ -52,6 +53,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 "com.joestelmach:natty:$nattyVersion"

testCompile "junit:junit:$junitVersion"
testCompile "org.testfx:testfx-core:$testFxVersion"
Expand All @@ -74,10 +76,10 @@ allprojects {
}

shadowJar {
archiveName = "addressbook.jar"
archiveName = "savvytasker.jar"

manifest {
attributes "Main-Class": "seedu.address.MainApp"
attributes "Main-Class": "seedu.savvytasker.MainApp"
}

destinationDir = file("${buildDir}/jar/")
Expand Down
3 changes: 3 additions & 0 deletions collate.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
java -jar Collate-TUI.jar collate from src/main to collated/main include java, fxml, css
java -jar Collate-TUI.jar collate from src/test to collated/test include java
java -jar Collate-TUI.jar collate from docs to collated/docs include md, html
Loading