CS2103AUG2016-T14-C2 · qhng · Nov 7, 2016 · Nov 6, 2016 · Nov 6, 2016 · Nov 7, 2016
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![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)
 
 # Savvy Tasker
 
@@ -22,6 +23,7 @@
 * 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)
diff --git a/collated/docs/A0138431L.md b/collated/docs/A0138431L.md
@@ -0,0 +1,63 @@
+# A0138431L
+###### \DeveloperGuide.md
+``` md
+### UI component
+
+<img src="images/UiClassDiagram.png" width="800"><br>
+
+**API** : [`Ui.java`](../src/main/java/seedu/savvytasker/ui/Ui.java)
+
+The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `TaskListPanel`, `UpcomingPanel`,  `DailyPanel`,  `FloatingPanel`,
+`StatusBarFooter` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class
+and they can be loaded using the `UiPartLoader`.
+
+The `UI` component uses JavaFx UI framework. The layout of these UI parts are defined in matching `.fxml` files
+ that are in the `src/main/resources/view` folder.<br>
+ For example, the layout of the [`MainWindow`](../src/main/java/seedu/savvytasker/ui/MainWindow.java) is specified in
+ [`MainWindow.fxml`](../src/main/resources/view/MainWindow.fxml)
+
+The `UI` component,
+* Executes user commands using the `Logic` component.
+* Binds itself to some data in the `Model` so that the UI can auto-update when data in the `Model` change.
+* Responds to events raised from various parts of the App and updates the UI accordingly.
+
+The cursor will be focus to the `CommandBox` by default as the `CommandBox` carries out numerous keyboard shortcuts to make the app more user-friendly. 
+
+```
+###### \UserGuide.md
+``` md
+
+#### Command stack history
+<kbd>UP</kbd>: Return last user input command in command box<br>
+<kbd>DOWN</kbd>: Return (if any) next user input command in command box<br>
+> Note that <kbd>DOWN</kbd> is only allowed after at least an <kbd>UP</kbd> is being entered
+
+
+#### Week Selection
+<kbd>Ctrl</kbd> + <kbd>LEFT</kbd>: Display previous week’s daily task list<br>
+<kbd>Ctrl</kbd> + <kbd>RIGHT</kbd>: Display next week’s daily task list
+
+```
+###### \UserGuide.md
+``` md
+
+## Keyboard Shortcuts
+
+Key Codes | Function | Command Box Input 
+-------- | :--------  | :-------- 
+<kbd>Esc</kbd> | Toggle to show/hide a list of keyboard shortcuts | -
+<kbd>Ctrl</kbd> + <kbd>D</kbd> | [Clear](#clearing-all-entries--clear) all entries | `clear`
+<kbd>Ctrl</kbd> + <kbd>Q</kbd> | [Exit](#exiting-the-program--exit) | `exit`
+<kbd>Ctrl</kbd> + <kbd>L</kbd> | [List](#listing-all-tasks-list) all unmarked task by date, earliest task first | `list`
+<kbd>Ctrl</kbd> + <kbd>A</kbd> | [List](#listing-all-tasks-list) archived tasks | `list archived`
+<kbd>Ctrl</kbd> + <kbd>P</kbd> | [List](#listing-all-tasks-list) all unmarked task by priority level, high priority first | `list priorityLevel`
+<kbd>Ctrl</kbd> + <kbd>I</kbd> | [List](#listing-all-tasks-list) all alias keys | `list alias`
+<kbd>Ctrl</kbd> + <kbd>H</kbd> | [Help](#viewing-help--help) | `help`
+<kbd>Ctrl</kbd> + <kbd>S</kbd> | Popups a directory chooser dialog box to choose a new filepath | `storage NEW_FILEPATH`
+<kbd>Ctrl</kbd> + <kbd>Z</kbd> | [Undo](#undo-the-most-recent-operation--undo) | `undo`
+<kbd>Ctrl</kbd> + <kbd>Y</kbd> | [Redo](#redo-the-most-recent-undo-operation--redo) | `redo`
+<kbd>Ctrl</kbd> + <kbd>UP</kbd> | Return [last user input](#command-stack-history) command in command box | -
+<kbd>Ctrl</kbd> + <kbd>DOWN</kbd> | Return (if any) [next user input](#command-stack-history) command in command box | -
+<kbd>Ctrl</kbd> + <kbd>LEFT</kbd> | Displays [previous week’s](#week-selection) daily task list | -
+<kbd>Ctrl</kbd> + <kbd>RIGHT</kbd> | Display [next week’s](#week-selection) daily task list | -
+```
diff --git a/collated/docs/A0139915W.md b/collated/docs/A0139915W.md
@@ -172,13 +172,17 @@ Format: `modify INDEX [t/TASK_NAME] [s/START_DATE] [e/END_DATE] [l/LOCATION] [p/
 
 #### Change storage location : `storage`
 Changes the storage location of Savvy Tasker.<br>
-Format: `storage PATH`
+Format: `storage NEW_FILEPATH`
 
 > Parameters | Description  
 > -------- | :-------- 
 > PATH | `Mandatory` Specifies the path where Savvy Tasker's task list is saved at.
 > <br>
-> If the new storage location specified by `PATH` is not accessible by Savvy Tasker, no change will be made to the existing path.
+> If the new storage location specified by `NEW_FILEPATH` is not accessible by Savvy Tasker, no change will be made to the existing path.
+
+```
+###### \UserGuide.md
+``` md
 
 ```
 ###### \UserGuide.md
@@ -198,9 +202,10 @@ Command | Format
 [Help](#viewing-help--help) | `help`
 [Modify](#modifies-a-task--modify) | `modify INDEX [t/TASK_NAME] [s/START_DATE] [e/END_DATE] [l/LOCATION] [p/PRIORITY_LEVEL] [r/RECURRING_TYPE] [n/NUMBER_OF_RECURRENCE] [c/CATEGORY] [d/DESCRIPTION]`<br>Example: `modify 2 t/Wednesday Weekly Milestone s/wed d/Project Meeting and Finalization`
 [Mark](#mark-a-task-as-done--mark) | `mark INDEX [MORE_INDEX]`<br>Example: `mark 1 2 3`
-[Storage](#change-storage-location--storage) | `storage PATH`<br>Example: `storage data/savvytasker.xml`
+[Storage](#change-storage-location--storage) | `storage NEW_FILEPATH`<br>Example: `storage data/savvytasker.xml`
 [Unmark](#unmark-a-task-as-done--unmark) | `unmark INDEX [MORE_INDEX]`<br>Example: `unmark 1 2 3`
 [Undo](#undo-the-most-recent-operation--undo) | `undo`
 [Redo](#redo-the-most-recent-undo-operation--redo) | `redo`
 [Unalias](#unalias-a-keyword--unalias) | `unalias s/SHORT_KEYWORD`<br>Example: `unalias s/mss`
+
 ```
diff --git a/collated/docs/A0139916U.md b/collated/docs/A0139916U.md
@@ -56,8 +56,8 @@ Format: `alias k/KEYWORD r/REPRESENTATION`
 
 > Parameters | Description  
 > -------- | :-------- 
-> KEYWORD | Specifies the keyword that will be replaced when met in a command, must be a single word
-> REPRESENTATION | Specifies the text that will replace the keyword
+> KEYWORD | Specifies the keyword that will be replaced when met in a command, must be a single word.
+> REPRESENTATION | Specifies the text that will replace the keyword. Cannot contain slashes.
 
 Examples: 
 * `alias k/pjm r/Project Meeting`<br>

diff --git a/collated/main/A0097627N.md b/collated/main/A0097627N.md
@@ -687,8 +687,6 @@
 
     public static final String MESSAGE_REDO_ACKNOWLEDGEMENT = "Last command redone";
 
-    public RedoCommand() {}
-
     @Override
     public CommandResult execute() {
         return new CommandResult(MESSAGE_REDO_ACKNOWLEDGEMENT);
@@ -899,8 +897,6 @@
 
     public static final String MESSAGE_UNDO_ACKNOWLEDGEMENT = "Last command undone";
 
-    public UndoCommand() {}
-
     @Override
     public CommandResult execute() {
         return new CommandResult(MESSAGE_UNDO_ACKNOWLEDGEMENT);
@@ -1070,7 +1066,4 @@
             }
         }
         else if (command.canUndo()){
-            undoStack.push(command);
-            redoStack.clear();
-        }
 ```