[T9][F10-C4]#179

Open

LiXiaoooowei wants to merge 342 commits intonus-cs2103-AY1617S1:masterfrom CS2103AUG2016-F10-C4:master

+21,833-4,262

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 24, 2016

Commits on Oct 27, 2016

Commits on Oct 28, 2016

Commits on Oct 30, 2016

change color of filter panel
LiXiaoooowei
committed
change main window layout and display index and tags for tasks
LiXiaoooowei
committed
Fix bug caused by the modification of date parser yesterday
shixiyue
committed
temporary change font and style
LiXiaoooowei
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
Added collated files

Angeline Neoh
authored and
Angeline Neoh
committed

Commits on Nov 1, 2016

Refactor Date and modify date parser to handle dates that are invalid but in the correct date format
shixiyue
committed
Add files via upload
LiXiaoooowei
authored
update ui picture
LiXiaoooowei
committed
Merge pull request #49 from CS2103AUG2016-F10-C4/refactor
shixiyue
authored
add ListCommandTest
LiXiaoooowei
committed
delete redundant listCommandTst
LiXiaoooowei
committed
Merge pull request #50 from CS2103AUG2016-F10-C4/unitTestOnDeleteRefreshDoneList
LiXiaoooowei
authored
Add files via upload
LiXiaoooowei
authored
Add priority class

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
Change icon image

Angeline Neoh
authored and
Angeline Neoh
committed
Continue updating
shixiyue
authored

Commits on Nov 2, 2016

Fix bugs in test folder caused by adding priority attribute (now all tests pass)
shixiyue
committed
refactor addCommand
LiXiaoooowei
committed
Change app title

Angeline Neoh
authored and
Angeline Neoh
committed

Commits on Nov 3, 2016

Change font and add priority

Angeline Neoh
authored and
Angeline Neoh
committed
refactor delete command, change delete by name to show all valid tasks and then delete by index, haven't update delete test cases yet
LiXiaoooowei
committed
Update filter to support filter by day (ignore time)
shixiyue
committed
Support jump to filtter panel by command and refactor types
shixiyue
committed
Support filter by priority in filter panel
shixiyue
committed
refactor recurring command
LiXiaoooowei
committed
refactor doneCommand
LiXiaoooowei
committed
Add test cases for jump commands and fix bugs
shixiyue
committed
refactor listCommand
LiXiaoooowei
committed
Merge pull request #51 from CS2103AUG2016-F10-C4/enhance-filter-panel
shixiyue
authored
Refactor and update unit test for FindCommand
shixiyue
committed
refactor listCommandTest in guitest
LiXiaoooowei
committed
Add unit test for filter command
shixiyue
committed
refactor add command test in guitest
LiXiaoooowei
committed
refactor delete command test in gui
LiXiaoooowei
committed
refactor done command test in gui
LiXiaoooowei
committed
refactor refresh command on gun
LiXiaoooowei
committed
minor fix
LiXiaoooowei
committed
Merge branch 'improveCodeQualify'
LiXiaoooowei
committed
resolve conflict
LiXiaoooowei
committed
Add GUI part in UserGuide
shixiyue
authored
Edit UI css

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
Modify add command message

Angeline Neoh
authored and
Angeline Neoh
committed
Fix bug
shixiyue
committed
Merge pull request #54 from CS2103AUG2016-F10-C4/update-user-guide
shixiyue
authored
Merge branch 'master' into unit-test-find-and-filter-command
shixiyue
committed
Fix bug
shixiyue
committed
Merge branch 'unit-test-find-and-filter-command'
shixiyue
committed
Edit EditCommandTest & Exit Command message

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
Add EditCommandTest to logic test

Angeline Neoh
authored and
Angeline Neoh
committed
Add new ui image & update edit command in user guide

Angeline Neoh
authored and
Angeline Neoh
committed
Update AboutUs.md
angellineeee
authored
Update AboutUs.md
angellineeee
authored
Update AboutUs.md
angellineeee
authored
Update AboutUs.md
angellineeee
authored
Update AboutUs.md
angellineeee
authored

Commits on Nov 4, 2016

Fix bug so all tests pass and change default user prefs
shixiyue
committed
Update Xiyue's part in AboutUs
shixiyue
authored
Add DateUtilTest
shixiyue
committed
Add test for Deadline and EventDate
shixiyue
committed
Merge pull request #56 from CS2103AUG2016-F10-C4/unit-test-for-date
shixiyue
authored
Edit font size and add jar file

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
no message
LiXiaoooowei
committed
update developer guide
LiXiaoooowei
committed
update user guide
LiXiaoooowei
committed
update aboutUs
LiXiaoooowei
committed
Merge pull request #57 from CS2103AUG2016-F10-C4/updateDeveloperGuide
LiXiaoooowei
authored
Merge pull request #58 from CS2103AUG2016-F10-C4/updateAboutUs
LiXiaoooowei
authored
Merge pull request #59 from CS2103AUG2016-F10-C4/updateUserGuide
LiXiaoooowei
authored
update UserGuide
LiXiaoooowei
committed
Add indicateAttemptToExecuteIncorrectCommand() when commands fail
shixiyue
committed
Minor adjustment (show all entries when input incorrect command)
shixiyue
committed
Merge pull request #60 from CS2103AUG2016-F10-C4/GUI-enhancement
shixiyue
authored
Fix EditCommand bugs

Angeline Neoh
authored and
Angeline Neoh
committed
no message

Angeline Neoh
authored and
Angeline Neoh
committed

Commits on Nov 5, 2016

remove redundant code on duplicate task
LiXiaoooowei
committed
update collated file
LiXiaoooowei
committed
Ignore failed edit tests. Will fix them later.
shixiyue
committed
Refactor change, undochange, redochange, undo and redo commands
shixiyue
committed
Refactor change command and undo/redo change commands gui tests
shixiyue
committed
Refactor undo command gui test
shixiyue
committed
Merge pull request #61 from CS2103AUG2016-F10-C4/refactor
shixiyue
authored
Fix EditCommand and EditCommand test

Angeline Neoh
authored and
Angeline Neoh
committed
Add comments to parser

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
Rename methods and add unit test for XmlTaskManagerStorage
shixiyue
committed
Remove redundant code in stemmer
shixiyue
committed
refactor add, delete, list, done and refresh commands
LiXiaoooowei
committed
Add integration test and correct comment format
shixiyue
committed
Fix bug in test code (All test should pass now)
shixiyue
committed
fix deletecommandtest bug indicated by travis
LiXiaoooowei
committed
Merge pull request #62 from CS2103AUG2016-F10-C4/intergation-unit-test-for-change
shixiyue
authored
Change types from string constant to enum
shixiyue
committed

Commits on Nov 6, 2016

Refacor filter panel
shixiyue
committed
Refacor filter command
shixiyue
committed
refactor recurring task code
LiXiaoooowei
committed
Update filter panel
shixiyue
committed
Merge branch 'master' into improvecodequality
LiXiaoooowei
committed
Refactor filter panel
shixiyue
committed
Add tests for the update method in filte panel
shixiyue
committed
Fix bug in filter panel test
shixiyue
committed
Merge pull request #67 from CS2103AUG2016-F10-C4/enhance-filter-panel
shixiyue
authored
continue..
LiXiaoooowei
committed
Merge branch 'master' into improvecodequality
LiXiaoooowei
committed
add recurringTest
LiXiaoooowei
committed
add test for missing recurring date exception
LiXiaoooowei
committed
add more test cases to refresh command test
LiXiaoooowei
committed
add more comments to refreshTest
LiXiaoooowei
committed
delete refresh test in logic test
LiXiaoooowei
committed
Merge pull request #66 from CS2103AUG2016-F10-C4/improvecodequality
LiXiaoooowei
authored
Add comments to EditCommand and tests

Angeline Neoh
authored and
Angeline Neoh
committed
Modify codes and add comments

Angeline Neoh
authored and
Angeline Neoh
committed

Commits on Nov 7, 2016

Modify comment and remove redundant code
shixiyue
committed
Fix bug in config util test and continue remove redundant code
shixiyue
committed
Fix bug in equal() method in ReadOnlyTask
shixiyue
committed
Review common and logic components.
shixiyue
committed
Fix bugs caused by modifying message
shixiyue
committed
update diagrams for Developer guide
LiXiaoooowei
committed
Continue...
shixiyue
committed
Merge pull request #69 from CS2103AUG2016-F10-C4/review
shixiyue
authored
Merge pull request #70 from CS2103AUG2016-F10-C4/improvecodequality
LiXiaoooowei
authored
Rename methods and classes in model component
shixiyue
committed
rename packages
LiXiaoooowei
committed
Review storage and ui component
shixiyue
committed
Merge pull request #71 from CS2103AUG2016-F10-C4/renamePackages
LiXiaoooowei
authored
Add files via upload
LiXiaoooowei
authored
update collated file
LiXiaoooowei
committed
Review tests
shixiyue
committed
extract method for prepareAdd
LiXiaoooowei
committed
Merge remote-tracking branch 'origin/master' into review
shixiyue
committed
Merge branch 'review'
shixiyue
committed
review test
LiXiaoooowei
committed
review user guide
LiXiaoooowei
committed
Merge pull request #73 from CS2103AUG2016-F10-C4/improvecodequality
LiXiaoooowei
authored
Update UserGuide.md
shixiyue
authored
Resolve conflicts in UserGuide
shixiyue
authored
Update developer guide
shixiyue
committed
update testScript.md and sampleTestData
LiXiaoooowei
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main
LiXiaoooowei
committed
Fix error in developer guide
shixiyue
authored
update aboutus.md
LiXiaoooowei
committed
Add jump to the task after adding or edit it
shixiyue
committed
Modify UI

Angeline Neoh
authored and
Angeline Neoh
committed
no message

Angeline Neoh
authored and
Angeline Neoh
committed
Modify TaskCard import package

Angeline Neoh
authored and
Angeline Neoh
committed
fix minor bugs
LiXiaoooowei
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main
LiXiaoooowei
committed
Modify import packages

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
update AboutUs.md to include all valid links
LiXiaoooowei
committed
review docs
LiXiaoooowei
committed
update links on developerGuide
LiXiaoooowei
committed
Modify TestScript

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
Update AboutUs.md
angellineeee
authored
Modify EditCommand

Angeline Neoh
authored and
Angeline Neoh
committed
Update TestScript.md
shixiyue
authored
Fix bug and change defualt storage file
shixiyue
committed
Fix undo message.
shixiyue
committed
Correct format in test script
shixiyue
authored
Add jump to respective item after delete and done. (remove jump to edit because it is buggy...)
shixiyue
committed
Modify EditCommand

Angeline Neoh
authored and
Angeline Neoh
committed
fix bugs
LiXiaoooowei
committed
minor fix
LiXiaoooowei
committed
Update TestScript.md
shixiyue
authored
fix bug
LiXiaoooowei
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main
LiXiaoooowei
committed
Update TestScript.md
shixiyue
authored
update collate
LiXiaoooowei
committed
Merge branches 'master' and 'master' of https://github.com/CS2103AUG2016-F10-C4/main
LiXiaoooowei
committed
Update UI picture

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
fix
LiXiaoooowei
committed
no message

Angeline Neoh
authored and
Angeline Neoh
committed
Update TestScript.md
shixiyue
authored
no message

Angeline Neoh
authored and
Angeline Neoh
committed
Merge branch 'master' of https://github.com/CS2103AUG2016-F10-C4/main

Angeline Neoh
authored and
Angeline Neoh
committed
Update JAR file

Angeline Neoh
authored and
Angeline Neoh
committed
update jar
LiXiaoooowei
committed
update testScript
LiXiaoooowei
committed
Fix bug in test
shixiyue
committed

Commits on Nov 9, 2016