Code

Date_Format_correction#142

Code

Open

dheerajaraj wants to merge 234 commits intonus-cs2103-AY1617S1:masternus-cs2103-AY1617S1/addressbook-level4:masterfrom CS2103AUG2016-T11-C1:dateErrorCorrectionCS2103AUG2016-T11-C1/main:dateErrorCorrectionCopy head branch name to clipboard

+4,433-2,827

Commits

Commits on Oct 1, 2016

• Change AboutUs.md

  lestertj

  committed
  65465ca

• Correct AboutUs.md

  lestertj

  committed
  0a71477

• Change UserGuide

  lestertj

  committed
  e667334

• Add 'component' to each member

  lestertj

  committed
  409b4df

• Edit program name

  lestertj

  committed
  0261dd3

• Refactor all class names

  lestertj

  committed
  67fde20

Commits on Oct 2, 2016

• Update User Guide and Developer Guide

  PankajB1997

  committed
  233f00d

• Minor change to Developer Guide

  PankajB1997

  committed
  39bce34

• Minor update to Developer Guide

  PankajB1997

  committed
  cd24726

• Update About Us and Contact Us page

  PankajB1997

  committed
  66162d9

• Update NFR from Java 7 to Java 8 in Developer Guide

  PankajB1997

  committed
  f64b91e

• Update User Guide

  PankajB1997

  committed
  bd07c91

• Minor update to User Guide

  PankajB1997

  committed
  e371212

Commits on Oct 4, 2016

• Rename Person to Task

  lestertj

  committed
  e3c3160

• Merge pull request #1 from CS2103AUG2016-T11-C1/complete_rename

  Show description for 18b2e45
  lestertj

  authored
  18b2e45

• Change Product Name temporarily to Smart Scheduler

  PankajB1997

  committed
  9adf549

• Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  4141c56

Commits on Oct 5, 2016

• Refactor person to task

  PankajB1997

  committed
  c907aea

• Changed Address Class to Unique ID

  lestertj

  committed
  9f38ea7

• Correct syntax error in LogicManagerTest.java

  PankajB1997

  committed
  6dc90ef

• Merge pull request #2 from CS2103AUG2016-T11-C1/Restructure_Person

  Show description for 084c128
  PankajB1997

  authored
  084c128

• Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  6c6d9cd

• Modified removed 'address' input in addcommand

  lestertj

  committed
  2402f02

• Removed Address in LogicManagerTest

  lestertj

  committed
  77f6b53

• Resolved merge conflict

  lestertj

  committed
  9d1e619

• Add NoteCommand

  fionnatong

  committed
  7edd520

• Merge branch 'modify_add_command'

  lestertj

  committed
  d429e30

• Update UI prototype for User Guide

  PankajB1997

  committed
  2e37517

• Update User Guide

  PankajB1997

  committed
  c28a7c4

• Update README.md

  PankajB1997

  committed
  6152f66

• Update Parser for NoteCommand

  fionnatong

  committed
  a58fec9

• Add acknowledgement to README.md

  PankajB1997

  committed
  41226f3

• Edit indentation of Parser

  fionnatong

  committed
  76c5cb7

• Update User Guide link for Help command

  PankajB1997

  committed
  1e75bf4

• Merge branch 'floating_tasks' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  597cb3a

• Update ModelManager and TaskList

  fionnatong

  committed
  6dd588b

• Corrected documentation

  lestertj

  committed
  c64fd00

• Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  f452fe5

• Merge branch 'floating_tasks' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  cabfa85

• Add pattern for Note

  fionnatong

  committed
  bd2b8c5

• Merge branch 'floating_tasks' of https://github.com/CS2103AUG2016-T11-C1/main

  lestertj

  committed
  8b3810c

• Edit EndTime and StartTime

  fionnatong

  committed
  382aa3e

• Minor changes

  fionnatong

  committed
  3f0eb30

• Merge branch 'floating_tasks' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  82e0fe6

• Update feedback messages for commands

  PankajB1997

  committed
  5c78c00

• Minor updates to User Guide and feedback messages

  PankajB1997

  committed
  d8eb3cd

• Update AboutUs.md

  PankajB1997

  committed
  11e7d82

• Update AboutUs.md - more changes

  PankajB1997

  committed
  0623535

• Update photo

  PankajB1997

  committed
  db1edca

• Add Project Mentor to AboutUs.md

  PankajB1997

  committed
  8eb2288

• Update AboutUs.md

  PankajB1997

  committed
  edb555d

• Update package name from 'address' to 'smartscheduler'

  PankajB1997

  committed
  f38a044

• change package name back to address

  PankajB1997

  committed
  3c7ddc2

Commits on Oct 6, 2016

• Made revisions to commands in user guide. Update commands have not been revised.

  dheerajaraj

  committed
  c07eb50

• Update UI

  PankajB1997

  committed
  c16ffb0

• Update UI

  PankajB1997

  committed
  53cc3a7

• Update comment in NoteCommand.java

  PankajB1997

  committed
  dbb5189

• Merge branch 'edit_userGuide' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  b79b39a

• Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main

  lestertj

  committed
  a7f497e

• Update User Guide and UI

  PankajB1997

  committed
  60dd5b8

• Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  1d63d66

• Add undo and redo commands to User Guide

  PankajB1997

  committed
  9f11992

• Minor markdown updates to User Guide

  PankajB1997

  committed
  898193b

• Update User Guide

  PankajB1997

  committed
  6392f9b

• Update Command Summary

  PankajB1997

  committed
  e6ca7c5

• Change Application Icon

  PankajB1997

  committed
  3e2eae8

• added_Priority

  dheerajaraj

  committed
  2a3975f

• Add delete task by name feature

  PankajB1997

  committed
  dc3f288

Commits on Oct 7, 2016

• Merged NoteCommand into AddCommand

  fionnatong

  committed
  ff45e7b

• Improve indentation

  fionnatong

  committed
  38950a1

• Improve indentation

  fionnatong

  committed
  5e54fd4

• Changes to meet JUnit Test

  fionnatong

  committed
  b5fdc6f

• Fixed delete_by_name

  Show description for af6b6d2
  lestertj

  committed
  af6b6d2

• Update User Guide

  PankajB1997

  committed
  4bcb710

• add_Priority_Floating_And_Normal_Tasks

  dheerajaraj

  committed
  a938c8f

• Add isComplete to Task

  PankajB1997

  committed
  3e54f99

• More work on delete

  PankajB1997

  committed
  a36fc7e

• Added null checks to EndTime and StartTime

  Show description for 072a38b
  lestertj

  committed
  072a38b

• Merged AddCommand to delete_by_name branch

  lestertj

  committed
  667a4d9

• Removed redundant function in ModelManager

  lestertj

  committed
  6d51536

• Removed redundant imports

  lestertj

  committed
  545c7d5

• Renamed persons to task

  lestertj

  committed
  314f510

• Added REGEX for floating and normal tasks for AddCommand

  Show description for 08cf94d
  lestertj

  committed
  08cf94d

• Add Complete Command class DoneCommand.java

  Show description for 916e3cd
  PankajB1997

  committed
  916e3cd

• Merge branch 'delete_by_name' of https://github.com/CS2103AUG2016-T11-C1/main

  Show description for e52e8d5
  PankajB1997

  committed
  e52e8d5

• Merge branch 'Resolved_NoteConflictsWithPriority' of https://github.com/CS2103AUG2016-T11-C1/main into delete_command

  Show description for 6a6bed8
  PankajB1997

  committed
  6a6bed8

• add priority

  PankajB1997

  committed
  c723fb3

• Change FindCommand.java to search through tasks using keywords

  PankajB1997

  committed
  baff95c

• Change person to task

  PankajB1997

  committed
  b1661d5

• Add Priority for tasks

  PankajB1997

  committed
  7bc1884

• Change Parser for Add command, include priority in actual parameters

  PankajB1997

  committed
  d563054

• Correct regex and constraint messages for Add

  PankajB1997

  committed
  19d125f

• Merge branch 'find_and_priority' of https://github.com/CS2103AUG2016-T11-C1/main

  Show description for bc4fd60
  PankajB1997

  committed
  bc4fd60

• Remove List and Select commands

  PankajB1997

  committed
  692252e

• Modify Clear Command success message

  PankajB1997

  committed
  960bc40

• Update User Guide (update and add commands)

  PankajB1997

  committed
  71c3dfc

Commits on Oct 8, 2016

• Add clear to User Guide, update command as class

  PankajB1997

  committed
  acf4027

• Change Name to TaskDetails

  PankajB1997

  committed
  e377c65

• Fixed add command regex to include optional priority, optional starting time and optional ending time

  lestertj

  committed
  e769ff6

• Allowed optional start and end times, and set default priority as low

  lestertj

  committed
  ae95c87

• Merge pull request #34 from CS2103AUG2016-T11-C1/fix_add_command_regex

  Show description for 40b189a
  lestertj

  authored
  40b189a

• Changed add regex to match user guide

  lestertj

  committed
  62a77f2

• Merge pull request #35 from CS2103AUG2016-T11-C1/fix_add_command_regex

  Show description for 86dcf7a
  lestertj

  authored
  86dcf7a

• Added local helpwindow page display

  lestertj

  committed
  c36ce3c

• Add setComplete to UniqueTaskList

  lestertj

  committed
  9c10101

• Added markTaskAsComplete to TaskList

  Show description for d9b2cda
  lestertj

  committed
  d9b2cda

• Added markTaskAsComplete to ModelManager

  Show description for 694deae
  lestertj

  committed
  694deae

• Added markTaskAsComplete to interface Model

  Show description for 01a299f
  lestertj

  committed
  01a299f

• Changed person to task in AddCommand

  lestertj

  committed
  db7bf7d

• Changed person to task in DeleteCommand

  lestertj

  committed
  6f2f120

• Changed person to task in DoneCommand

  lestertj

  committed
  ca015e9

• Changed person to task in FindCommand

  lestertj

  committed
  0a840ff

• Changed person to task in LogicManagerTest

  lestertj

  committed
  85b78d0

• Added DoneCommand class

  lestertj

  committed
  b29baad

• Added updateFilteredListToShowIncomplete to Model interface

  lestertj

  committed
  9f1627a

• Added updateFilteredListToShowIncomplete

  Show description for cfbdeff
  lestertj

  committed
  cfbdeff

• Merge pull request #36 from CS2103AUG2016-T11-C1/done_command

  Show description for b00cee8
  lestertj

  authored
  b00cee8

• Fixed addCommand parsing

  lestertj

  committed
  fa4369d

• Merge pull request #37 from CS2103AUG2016-T11-C1/fix_add_command

  Show description for 640e462
  lestertj

  authored
  640e462

Commits on Oct 10, 2016

• Added "\" escape char for addcommand

  lestertj

  committed
  61bb408

• Merge pull request #38 from CS2103AUG2016-T11-C1/add_addcommand_escape_char

  Show description for 5589c4d
  lestertj

  authored
  5589c4d

• Updated userguide

  lestertj

  committed
  7256987

• Removed parser debugging statement

  lestertj

  committed
  ab73834

• Merge pull request #39 from CS2103AUG2016-T11-C1/minor_userguide_updates

  Show description for a38caa0
  lestertj

  authored
  a38caa0

• Merge pull request #40 from CS2103AUG2016-T11-C1/add_help_command

  Show description for 91c8ec3
  lestertj

  authored
  91c8ec3

• Minor update to User Guide

  PankajB1997

  committed
  7023770

• Refactored

  lestertj

  committed
  ebaee86

• Merge pull request #41 from CS2103AUG2016-T11-C1/refactor_packages

  Show description for 03ba86a
  lestertj

  authored
  03ba86a

• More refactoring of class names

  lestertj

  committed
  bbb4e61

• Refactored "person" to "task"

  lestertj

  committed
  3c9c02c

• Merge pull request #42 from CS2103AUG2016-T11-C1/more_name_refactoring

  Show description for c483dc1
  lestertj

  authored
  c483dc1

• Update userguide

  fionnatong

  committed
  fad984c

• Update developerguide

  fionnatong

  committed
  1ed2fa1

• Update DeveloperGuide

  fionnatong

  committed
  c245335

• Merge pull request #43 from CS2103AUG2016-T11-C1/minor_updates

  Show description for 638a2a0
  fionnatong

  authored
  638a2a0

• Modify message displayed for successful task addition

  PankajB1997

  committed
  f2bfdc2

• Update README.md

  PankajB1997

  committed
  ba7ca47

• Update User Guide based on TA's recommendation

  PankajB1997

  committed
  c168f71

• Minor Update to UG

  PankajB1997

  committed
  23ae972

• Update Show command in User Guide

  PankajB1997

  committed
  5d7edb5

• Minor update to User Guide

  PankajB1997

  committed
  f813ab8

• Minor update to User Guide

  PankajB1997

  committed
  715f20e

• Add UpdateCommand.java

  PankajB1997

  committed
  5dc297d

• Change getName() to getTaskDetails() and fix regressions

  PankajB1997

  committed
  b7632b4

• Complete UpdateCommand (regex not working, to be fixed)

  PankajB1997

  committed
  0d93163

Commits on Oct 11, 2016

• Update find command parser to look for tasks containing the entered word

  PankajB1997

  committed
  772bf9f

• Update Parser for Done and Delete commands

  PankajB1997

  committed
  cdc1ac8

• Fixed EndTime and StartTime validation regex

  lestertj

  committed
  102836d

• Fixed addCommand tests

  lestertj

  committed
  8d9f802

• Merge pull request #45 from CS2103AUG2016-T11-C1/fix_time_validation_regex

  Show description for d438992
  lestertj

  authored
  d438992

• Merge branch 'master' into fix_add_command_test

  lestertj

  committed
  57df1a4

• Merge pull request #46 from CS2103AUG2016-T11-C1/fix_add_command_test

  Show description for f5c7b02
  lestertj

  authored
  f5c7b02

• Fixed add parser

  lestertj

  committed
  94aeed8

• Merge pull request #47 from CS2103AUG2016-T11-C1/fix_add_parser

  Show description for 362d7f6
  lestertj

  authored
  362d7f6

• Refactored Test from addressbook to tasklist

  lestertj

  committed
  b7e3374

• Merge pull request #48 from CS2103AUG2016-T11-C1/refactor_test

  Show description for 37196bb
  lestertj

  authored
  37196bb

• Modify regex for update

  PankajB1997

  committed
  194b982

• Fixed update regex

  Show description for b80dd50
  lestertj

  committed
  b80dd50

• Fixed update_command regex

  Show description for 3296f1c
  lestertj

  authored
  3296f1c

• Introduce ShowCommand

  fionnatong

  committed
  e0ed17a

• Update Parser for ShowCommand

  fionnatong

  committed
  1c2a83e

• Update ModelManager for ShowCommand

  fionnatong

  committed
  75dca01

• Show tasks based on priority

  fionnatong

  committed
  139bdfe

• Slight changes to ShowCommand

  fionnatong

  committed
  1de17e0

• Add all, complete and p/ categories for ShowCommand

  fionnatong

  committed
  a65e4e7

• Add incomplete category to ShowCommand

  fionnatong

  committed
  2a2e165

• Improve indentation

  fionnatong

  committed
  5af8f11

• Add test cases for ShowCommand

  fionnatong

  committed
  ee21d17

• Add incomplete category into showcommand

  fionnatong

  committed
  e075da8

• update showcommand

  fionnatong

  committed
  6f8ef0e

Commits on Oct 12, 2016

• Update showcommand

  fionnatong

  committed
  33b09f0

• Refactor Person to Task and AddressBook to TaskList

  PankajB1997

  committed
  cee15bd

• Allow case-insensitive matching of task keywords

  PankajB1997

  committed
  507488c

• Merge pull request #51 from CS2103AUG2016-T11-C1/refactor_names

  Show description for 6fb46cc
  lestertj

  authored
  6fb46cc

• Update test cases for FindCommand, refactor persons to tasks

  PankajB1997

  committed
  bb9f981

• Merge branch 'refactor_names' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  156cac9

• Added donecommand tests

  Show description for 95fc6af
  lestertj

  committed
  95fc6af

• Merge pull request #53 from CS2103AUG2016-T11-C1/done_command_test

  Show description for 390e635
  lestertj

  authored
  390e635

• Added start_time_parser

  lestertj

  committed
  354a90a

• Merge pull request #54 from CS2103AUG2016-T11-C1/Add_start_time_parser

  Show description for 61d9fe9
  lestertj

  authored
  61d9fe9

• Add tests for Update command

  PankajB1997

  committed
  bd8e00b

• Add test cases for delete, minor refactoring

  PankajB1997

  committed
  9c7be1d

• Merge pull request #52 from CS2103AUG2016-T11-C1/refactor_names

  Show description for 56d9662
  PankajB1997

  authored
  56d9662

• Merge pull request #55 from CS2103AUG2016-T11-C1/test_update_command

  Show description for 4095e74
  PankajB1997

  authored
  4095e74

• Merge pull request #56 from CS2103AUG2016-T11-C1/test_delete

  Show description for eb888a3
  PankajB1997

  authored
  eb888a3

• Added NLP parsing to startime

  lestertj

  committed
  7e3fa86

• Added NLP parsing to endtime

  lestertj

  committed
  6b06822

• Changed task storage format

  lestertj

  committed
  cc4dad0

• Changed taskcard display

  lestertj

  committed
  23f6e05

• included nattytime parser

  lestertj

  committed
  d59a53e

• Fixed personcardhandle

  lestertj

  committed
  b118c3f

• Fixed testtask

  lestertj

  committed
  97a047f

• Merge pull request #57 from CS2103AUG2016-T11-C1/add_time_parsers

  Show description for 0273a2a
  lestertj

  authored
  0273a2a

• Refactor person to task in ShowCommand

  PankajB1997

  committed
  f48509f

• Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  6d654c3

• Corrected prepareupdate

  lestertj

  committed
  121adf0

• Corrected personcardhandle

  lestertj

  committed
  a01efc4

• Corrected test data

  lestertj

  committed
  f623725

• Corrected test data

  lestertj

  committed
  e3fa8e4

• Merge branch 'master' into add_time_parsers

  lestertj

  committed
  9cc32af

• Merge pull request #58 from CS2103AUG2016-T11-C1/add_time_parsers

  Show description for ab0473e
  lestertj

  authored
  ab0473e

• Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  6510704

• Change package of DoneCommandTest.java

  PankajB1997

  committed
  92799d5

Commits on Oct 13, 2016

• Removed debugging statements

  lestertj

  committed
  27eb75e

• Added done gui test

  lestertj

  committed
  56470a0

• Merge pull request #59 from CS2103AUG2016-T11-C1/add_done_gui_test

  Show description for 91ec9cc
  lestertj

  authored
  91ec9cc

• Fix ShowCommandTest

  PankajB1997

  committed
  8ee80b0

• Added completion status icon to UI

  lestertj

  committed
  58efcbd

• Merge pull request #61 from CS2103AUG2016-T11-C1/ui_add_status_icon

  Show description for 24755a6
  lestertj

  authored
  24755a6

• Added UI icons for completion status

  lestertj

  committed
  9eb1154

• Merge pull request #62 from CS2103AUG2016-T11-C1/ui_add_status_icon

  Show description for 604a5ac
  lestertj

  authored
  604a5ac

• Added TimePreparser

  Show description for ffafcb9
  lestertj

  committed
  ffafcb9

• Merge pull request #63 from CS2103AUG2016-T11-C1/rearranged_date_format

  Show description for f3c5284
  lestertj

  authored
  f3c5284

• Update ReadMe.md

  PankajB1997

  committed
  edf6765

• Merge branch 'master' of https://github.com/CS2103AUG2016-T11-C1/main

  PankajB1997

  committed
  d9f1205

• Fixed addCommand escape character

  Show description for a41836f
  lestertj

  committed
  a41836f

• Added escape parser for update

  lestertj

  committed
  649d60e

• Merge pull request #64 from CS2103AUG2016-T11-C1/fix_add_command_escape

  Show description for cbe6ccf
  lestertj

  authored
  cbe6ccf

• fixed date displayed

  Show description for 9ab94e3
  dheerajaraj

  committed
  9ab94e3

• changed from 24 hrs to a.m and p.m

  dheerajaraj

  committed
  45bd48e

• made the relevant changes...

  dheerajaraj

  committed
  f11d6c1

• fixed errors on Endtime and startTime

  dheerajaraj

  committed
  4451ce2

Commits on Oct 14, 2016

• fixed parser unable to accept forward slash format for dates

  dheerajaraj

  committed
  c1f7659

• foxed forward slash

  dheerajaraj

  committed
  8ee49af

• fixed and tested cases

  dheerajaraj

  committed
  05ec286

• Disable task selection browserloading

  lestertj

  committed
  dea0807

• Changed browser panel to category panel

  lestertj

  committed
  646cd71

• Rearranged elements

  lestertj

  committed
  6122164

• Created new categorypanel fxml

  lestertj

  committed
  05fe430

• Created new categorypanel class

  lestertj

  committed
  95e3fe5

• Merge pull request #77 from CS2103AUG2016-T11-C1/rearrange_ui

  Show description for f61fd26
  lestertj

  authored
  f61fd26

• corrected the format of display results

  dheerajaraj

  committed
  7d4f2fc

• resurrected toString() and finalised format

  dheerajaraj

  committed
  a3163fe

• Merge branch 'master' into dateErrorCorrection

  lestertj

  committed
  547d137