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.

Sign up for GitHub

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

Jump to bottom

Fixes issue #13 #168

Open
wants to merge 91 commits into
base: master
Choose a base branch
from
Open

Fixes issue #13 #168

wants to merge 91 commits into from

Conversation

KhooDesmond
Copy link

No description provided.

shusiner and others added 30 commits October 5, 2016 12:02
@shusiner
change name to main
430a7d9
@kwonn
Add dev photo
ae2fdf4
@shusiner
Update UserGuide.md
7e26fbb
@annabeleng
Add dev photo Annabel Eng
bb35feb
@annabeleng
Update AboutUs.md
43d335a
@annabeleng
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
d4addf2
@shusiner
Add files via upload
2374eab
@kwonn
Update UserGuide.md
728b682
@annabeleng
Update AboutUs.md
2f3e652
@kwonn
Update README.md
f848dd5
@annabeleng
Add dev photo Ng HuanRan
fec79fe
@kwonn
Delete extra photos
a134521
@kwonn
Merge branch 'master' of https://github.com/nus-cs2103-AY1617S1/addre…
87a4f68 
…ssbook-level4
@annabeleng
Update DeveloperGuide
215aec6 
Update User Stories
Update Use Cases
Update NFR
Update Glossary
Update Product Surveys
@kwonn
Merge branch 'master' of https://github.com/nus-cs2103-AY1617S1/addre…
348eed2 
…ssbook-level4
@kwonn
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
b49c08d 
# Conflicts:
#	docs/DeveloperGuide.md
@kwonn
Update DeveloperGuide.md
b1dc34e
@kwonn
Update DeveloperGuide.md
5f9160c
@annabeleng
Change addressbook to malitio
896ef82 
Change person to task
@annabeleng
Modify Molitio so the app can be executed.
170f9f3 
Tests not yet fully refactored
@KhooDesmond
Add info about myself
3dcb4c4
@KhooDesmond
Change addressbook tests to malitio tests
fbd9243
@KhooDesmond
Update README.md
46f1538
@KhooDesmond
Update README.md
5990b35
@shusiner
Update .project
4f6208b
@annabeleng
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main …
13e579c 
…into Refactor_Person_to_Task

# Conflicts:
#	README.md
@annabeleng
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
77dd54c
@shusiner
Update UserGuide.md
30d0c5a
@kwonn
Update ReadMe with our mock UI
d51415d
@kwonn
Refactor address to Malitio where applicable
c6a1d55
annabeleng and others added 28 commits October 17, 2016 16:54
@annabeleng
Refactor FloatingTask, Deadline and Event
9767935 
Add Deadline Panel
@annabeleng
Remove browser panel
63d9f1a
@annabeleng
Add third panel for Events.
94dadac
@KhooDesmond
Refactor test cases to reflect events, deadlines and floating tasks
59e9f01
@KhooDesmond
Fix XmlMalitioStorageTest
e03f20a
@shusiner
rename logic test cases
25da3be
@KhooDesmond
Fix error in test/java/seedu/malitio/testutil
1ead376
@KhooDesmond
Merge branch 'initialize_storage_for_schedule' of https://github.com/…
b317719 
…CS2103AUG2016-T13-C3/main into initialize_storage_for_schedule
@annabeleng
Update AboutUs.md
24f7454
@KhooDesmond
Change typical test tasks
31d7c63
@KhooDesmond
Fix testing
b339e03
@KhooDesmond
Remove editCommand test and adjusted validMalitio.xml
c71529e
@shusiner
Merge pull request #20 from CS2103AUG2016-T13-C3/initialize_storage_f…
33dd6c2 
…or_schedule

Initialize storage for schedule
@shusiner
update UiClassDiagram
8c7263f
@shusiner
Update DeveloperGuide.md
8dbf612 
change some class name in the descriptions.
@shusiner
update UiClassDiagram.png
9621585
@shusiner
update UiClassDiagram.png
e80eaad 
previously have some minor mistakes
@annabeleng
Update Model Picture in ModelClassDiagram
47bb3b0
@annabeleng
Update UI image to match final UI
ac8c05b
@annabeleng
Merge pull request #21 from CS2103AUG2016-T13-C3/UI_documentation
9dd957e 
Update Ui documentation
@annabeleng
Update DeveloperGuide
feef41a 
Modify use cases according to logic
Renamed molitio to malitio
@annabeleng
Merge pull request #22 from CS2103AUG2016-T13-C3/update-developerguide
fb617ec 
Update DeveloperGuide
@KhooDesmond
Update FindCommand to find keywords in all event, deadlines and float…
4246a13 
…ing task panels
@KhooDesmond
Revert "Update FindCommand to find keywords in all event, deadlines a…
802dccb 
…nd floating task panels"

This reverts commit 4246a13.
@KhooDesmond
Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main
2caf1d8 
 floating task panels"

This reverts commit 4246a13.
@KhooDesmond
Update FindCommand to find keywords in all event, deadlines and float…
cb683f2 
…ing task panels
@KhooDesmond
Enhance find command to find only floating task, deadline or schedule
8e127fb
@KhooDesmond
Fix bug that displays wrong find result
804e17e
@nus-se-pr-bot
Copy link

Hi @KhooDesmond, your pull request title is invalid. It should be in the format of [Activity ID][Team ID] Your name, where [Activity Id] has no dashes or spaces (e.g. [T2A3] stands for Tutorial 2 Activity 3) and [Team ID] has one dash only and no spaces (e.g. [W14-A2] means Wednesday 2pm (14 hrs), Phase A, Team 2). Please follow the instructions given strictly and edit your title for reprocessing.

Submit only one activity per pull request (unless otherwise stated in instructions) and do remember to create your branches from the commit where the master branch is pointing at so that each PR you submit only consist of commits meant for the activity.

Note: this comment is posted by a bot. If you believe this is done in error, please create an issue at cs2103-pr-bot and add a link to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
FormatCheckRequested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@KhooDesmond @nus-se-pr-bot @shusiner @kwonn @annabeleng