Code

Fixes issue #13#168

Code

Open

KhooDesmond wants to merge 91 commits intonus-cs2103-AY1617S1:masternus-cs2103-AY1617S1/addressbook-level4:masterfrom CS2103AUG2016-T13-C3:find_commandCS2103AUG2016-T13-C3/main:find_commandCopy head branch name to clipboard

+5,936-4,293

Commits

Commits on Oct 5, 2016

• change name to main

  shusiner

  committed
  430a7d9

  Copy full SHA for 430a7d9

• Add dev photo

  kwonn

  committed
  ae2fdf4

  Copy full SHA for ae2fdf4

• Update UserGuide.md

  shusiner

  authored
  7e26fbb

  Copy full SHA for 7e26fbb

• Add dev photo Annabel Eng

  annabeleng

  committed
  bb35feb

  Copy full SHA for bb35feb

• Update AboutUs.md

  annabeleng

  committed
  43d335a

  Copy full SHA for 43d335a

• Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main

  annabeleng

  committed
  d4addf2

  Copy full SHA for d4addf2

• Add files via upload

  shusiner

  authored
  2374eab

  Copy full SHA for 2374eab

• Update UserGuide.md

  kwonn

  authored
  728b682

  Copy full SHA for 728b682

• Update AboutUs.md

  annabeleng

  authored
  2f3e652

  Copy full SHA for 2f3e652

• Update README.md

  kwonn

  authored
  f848dd5

  Copy full SHA for f848dd5

• Add dev photo Ng HuanRan

  annabeleng

  committed
  fec79fe

  Copy full SHA for fec79fe

• Delete extra photos

  kwonn

  committed
  a134521

  Copy full SHA for a134521

• Merge branch 'master' of https://github.com/nus-cs2103-AY1617S1/addressbook-level4

  kwonn

  committed
  87a4f68

  Copy full SHA for 87a4f68

• Update DeveloperGuide

  Show description for 215aec6
  annabeleng

  authored
  215aec6

  Copy full SHA for 215aec6

• Merge branch 'master' of https://github.com/nus-cs2103-AY1617S1/addressbook-level4

  kwonn

  committed
  348eed2

  Copy full SHA for 348eed2

• Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main

  Show description for b49c08d
  kwonn

  committed
  b49c08d

  Copy full SHA for b49c08d

• Update DeveloperGuide.md

  kwonn

  authored
  b1dc34e

  Copy full SHA for b1dc34e

• Update DeveloperGuide.md

  kwonn

  authored
  5f9160c

  Copy full SHA for 5f9160c

• Change addressbook to malitio

  Show description for 896ef82
  annabeleng

  committed
  896ef82

  Copy full SHA for 896ef82

• Modify Molitio so the app can be executed.

  Show description for 170f9f3
  annabeleng

  committed
  170f9f3

  Copy full SHA for 170f9f3

• Add info about myself

  KhooDesmond

  committed
  3dcb4c4

  Copy full SHA for 3dcb4c4

• Change addressbook tests to malitio tests

  KhooDesmond

  committed
  fbd9243

  Copy full SHA for fbd9243

Commits on Oct 6, 2016

• Update README.md

  KhooDesmond

  committed
  46f1538

  Copy full SHA for 46f1538

• Update README.md

  KhooDesmond

  committed
  5990b35

  Copy full SHA for 5990b35

• Update .project

  shusiner

  authored
  4f6208b

  Copy full SHA for 4f6208b

• Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main into Refactor_Person_to_Task

  Show description for 13e579c
  annabeleng

  committed
  13e579c

  Copy full SHA for 13e579c

• Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main

  annabeleng

  committed
  77dd54c

  Copy full SHA for 77dd54c

• Update UserGuide.md

  shusiner

  authored
  30d0c5a

  Copy full SHA for 30d0c5a

• Update ReadMe with our mock UI

  kwonn

  committed
  d51415d

  Copy full SHA for d51415d

Commits on Oct 7, 2016

• Refactor address to Malitio where applicable

  kwonn

  committed
  c6a1d55

  Copy full SHA for c6a1d55

• Refactor Person to Task, but doesn't pass all tests yet

  kwonn

  committed
  8f6d706

  Copy full SHA for 8f6d706

• Edit tests to match refactoring

  kwonn

  committed
  7439ebe

  Copy full SHA for 7439ebe

Commits on Oct 9, 2016

• Merge branch 'Refactor_Person_to_Task' of https://github.com/CS2103AUG2016-T13-C3/main into Refactor_Person_to_Task

  KhooDesmond

  committed
  e039507

  Copy full SHA for e039507

• Change version to v0.1.0, add temporary icon for our app, refactor malitio/commons/core/Config.java

  KhooDesmond

  committed
  9d21652

  Copy full SHA for 9d21652

Commits on Oct 10, 2016

• Rename app to Malitio

  KhooDesmond

  committed
  36de261

  Copy full SHA for 36de261

• Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main

  annabeleng

  committed
  c0888db

  Copy full SHA for c0888db

Commits on Oct 11, 2016

• Change person test cases to task test cases

  KhooDesmond

  committed
  d1e838c

  Copy full SHA for d1e838c

• Change app name in config.json file

  KhooDesmond

  committed
  3be1790

  Copy full SHA for 3be1790

• Change app name in config.json file

  KhooDesmond

  committed
  8222330

  Copy full SHA for 8222330

• Allow task name to have any character except '/'

  kwonn

  committed
  89b0875

  Copy full SHA for 89b0875

• Merge branch 'Refactor_Person_to_Task'

  Show description for e7847fe
  kwonn

  committed
  e7847fe

  Copy full SHA for e7847fe

Commits on Oct 12, 2016

• updated another view preparing for event/deadlines.

  shusiner

  committed
  fa35e86

  Copy full SHA for fa35e86

• EditCommand can edit floating tasks. (i.e. tasks only with name).

  Show description for 8784fc6
  annabeleng

  committed
  8784fc6

  Copy full SHA for 8784fc6

• Include deadlines and events as part of task, add DateTime class

  KhooDesmond

  committed
  23ee44a

  Copy full SHA for 23ee44a

Commits on Oct 13, 2016

• Refactor task.java

  KhooDesmond

  committed
  862c8bd

  Copy full SHA for 862c8bd

• Add one test case for add deadline command

  KhooDesmond

  committed
  c0174dc

  Copy full SHA for c0174dc

• Merge branch 'add_deadlines_and_events' of https://github.com/CS2103AUG2016-T13-C3/main into Add_EditCommand

  annabeleng

  committed
  33e8002

  Copy full SHA for 33e8002

• Update Parser to support universal add (with errors).

  

  kwonn

  authored and

  KhooDesmond

  committed
  ec308ce

  Copy full SHA for ec308ce

• Support events

  KhooDesmond

  committed
  bd9c4a6

  Copy full SHA for bd9c4a6

• Merge pull request #5 from CS2103AUG2016-T13-C3/Add_EditCommand

  Show description for e6e02af
  kwonn

  authored
  e6e02af

  Copy full SHA for e6e02af

• Refactor success add message

  KhooDesmond

  committed
  83a5e5c

  Copy full SHA for 83a5e5c

• Merge remote-tracking branch 'origin/add_deadlines_and_events'

  kwonn

  committed
  2a24e55

  Copy full SHA for 2a24e55

• Merge remote-tracking branch 'origin/event_deadline_UI'

  kwonn

  committed
  7920ebe

  Copy full SHA for 7920ebe

Commits on Oct 14, 2016

• added deadline, events and floating task classes

  shusiner

  committed
  581ac86

  Copy full SHA for 581ac86

• Changed Task to abstract class and rename all task constructor into FloatingTask constructor

  shusiner

  committed
  5d5765a

  Copy full SHA for 5d5765a

• streamline abstract classes for task events and deadlines

  shusiner

  committed
  cd333b5

  Copy full SHA for cd333b5

• added tasklist2 to model

  shusiner

  committed
  751a46a

  Copy full SHA for 751a46a

• link task list2 to gui

  shusiner

  committed
  b2411be

  Copy full SHA for b2411be

• small error on error message for add incorrect command

  shusiner

  committed
  0f4aec5

  Copy full SHA for 0f4aec5

• refactored name: task and task2 to floating task and events and deadlines

  shusiner

  committed
  1e3055f

  Copy full SHA for 1e3055f

• added ability to add deadlines and events

  shusiner

  committed
  4b810a3

  Copy full SHA for 4b810a3

Commits on Oct 15, 2016

• Change parent class of Deadlines and Events to Schedules

  Show description for 07e5921
  annabeleng

  committed
  07e5921

  Copy full SHA for 07e5921

• Change XmlAdaptedSchedule to return a Schedule Object with Name and Tags.

  Show description for 432c4fc
  annabeleng

  committed
  432c4fc

  Copy full SHA for 432c4fc

Commits on Oct 17, 2016

• Refactor FloatingTask, Deadline and Event

  Show description for 9767935
  annabeleng

  committed
  9767935

  Copy full SHA for 9767935

• Remove browser panel

  annabeleng

  committed
  63d9f1a

  Copy full SHA for 63d9f1a

• Add third panel for Events.

  annabeleng

  committed
  94dadac

  Copy full SHA for 94dadac

Commits on Oct 18, 2016

• Refactor test cases to reflect events, deadlines and floating tasks

  KhooDesmond

  committed
  59e9f01

  Copy full SHA for 59e9f01

• Fix XmlMalitioStorageTest

  KhooDesmond

  committed
  e03f20a

  Copy full SHA for e03f20a

• rename logic test cases

  shusiner

  committed
  25da3be

  Copy full SHA for 25da3be

• Fix error in test/java/seedu/malitio/testutil

  KhooDesmond

  committed
  1ead376

  Copy full SHA for 1ead376

• Merge branch 'initialize_storage_for_schedule' of https://github.com/CS2103AUG2016-T13-C3/main into initialize_storage_for_schedule

  KhooDesmond

  committed
  b317719

  Copy full SHA for b317719

• Update AboutUs.md

  annabeleng

  authored
  24f7454

  Copy full SHA for 24f7454

• Change typical test tasks

  KhooDesmond

  committed
  31d7c63

  Copy full SHA for 31d7c63

• Fix testing

  KhooDesmond

  committed
  b339e03

  Copy full SHA for b339e03

• Remove editCommand test and adjusted validMalitio.xml

  KhooDesmond

  committed
  c71529e

  Copy full SHA for c71529e

• Merge pull request #20 from CS2103AUG2016-T13-C3/initialize_storage_for_schedule

  Show description for 33dd6c2
  shusiner

  authored
  33dd6c2

  Copy full SHA for 33dd6c2

• update UiClassDiagram

  shusiner

  authored
  8c7263f

  Copy full SHA for 8c7263f

• Update DeveloperGuide.md

  Show description for 8dbf612
  shusiner

  authored
  8dbf612

  Copy full SHA for 8dbf612

• update UiClassDiagram.png

  shusiner

  authored
  9621585

  Copy full SHA for 9621585

• update UiClassDiagram.png

  Show description for e80eaad
  shusiner

  authored
  e80eaad

  Copy full SHA for e80eaad

Commits on Oct 19, 2016

• Update Model Picture in ModelClassDiagram

  annabeleng

  committed
  47bb3b0

  Copy full SHA for 47bb3b0

• Update UI image to match final UI

  annabeleng

  committed
  ac8c05b

  Copy full SHA for ac8c05b

• Merge pull request #21 from CS2103AUG2016-T13-C3/UI_documentation

  Show description for 9dd957e
  annabeleng

  authored
  9dd957e

  Copy full SHA for 9dd957e

• Update DeveloperGuide

  Show description for feef41a
  annabeleng

  authored
  feef41a

  Copy full SHA for feef41a

• Merge pull request #22 from CS2103AUG2016-T13-C3/update-developerguide

  Show description for fb617ec
  annabeleng

  authored
  fb617ec

  Copy full SHA for fb617ec

• Update FindCommand to find keywords in all event, deadlines and floating task panels

  KhooDesmond

  committed
  4246a13

  Copy full SHA for 4246a13

• Revert "Update FindCommand to find keywords in all event, deadlines and floating task panels"

  Show description for 802dccb
  KhooDesmond

  committed
  802dccb

  Copy full SHA for 802dccb

• Merge branch 'master' of https://github.com/CS2103AUG2016-T13-C3/main

  Show description for 2caf1d8
  KhooDesmond

  committed
  2caf1d8

  Copy full SHA for 2caf1d8

• Update FindCommand to find keywords in all event, deadlines and floating task panels

  KhooDesmond

  committed
  cb683f2

  Copy full SHA for cb683f2

• Enhance find command to find only floating task, deadline or schedule

  KhooDesmond

  committed
  8e127fb

  Copy full SHA for 8e127fb

• Fix bug that displays wrong find result

  KhooDesmond

  committed
  804e17e

  Copy full SHA for 804e17e