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.

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

Updated UG/Dg, added personal portfolio. Solved deferDeadline bug, edited test case for deferDeadline and sortTask #118

Merged
merged 88 commits into from Nov 12, 2018

Commits on Sep 26, 2018

  1. Updated UG and DG for viewDate + selectDate (CS2113-AY1819S1-W13-3#2)

    * Modified aboutUs page: Ks
    
    * Updated UG and DG for viewDate + selectDate
    emobeany authored and chel-seyy committed Sep 26, 2018
    Copy the full SHA
    fd217c0 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    4a50798 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    7d8edfb View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    066fbea View commit details
    Browse the repository at this point in the history
  5. Merge branch 'CC'

    ChanChunCheong committed Sep 26, 2018
    Copy the full SHA
    f785bdb View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    872ba67 View commit details
    Browse the repository at this point in the history
  7. Profile Picture

    ChanChunCheong committed Sep 26, 2018
    Copy the full SHA
    51d2f4e View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    762993d View commit details
    Browse the repository at this point in the history
  9. ChanChunCheong

    ChanChunCheong committed Sep 26, 2018
    Copy the full SHA
    b478ae8 View commit details
    Browse the repository at this point in the history
  10. Copy the full SHA
    fe336f5 View commit details
    Browse the repository at this point in the history
  11. Edited the User Guide

    ChanChunCheong committed Sep 26, 2018
    Copy the full SHA
    89c1ac3 View commit details
    Browse the repository at this point in the history
  12. Copy the full SHA
    3586e92 View commit details
    Browse the repository at this point in the history
  13. Copy the full SHA
    fb43601 View commit details
    Browse the repository at this point in the history
  14. Added user stories

    ChanChunCheong committed Sep 26, 2018
    Copy the full SHA
    83d1e5e View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

  1. Copy the full SHA
    d1e26a5 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    74e1692 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2018

  1. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	docs/DeveloperGuide.adoc
    #	docs/UserGuide.adoc
    #	src/main/java/seedu/address/logic/LogicManager.java
    #	src/main/java/seedu/address/ui/CommandBox.java
    ChanChunCheong committed Sep 29, 2018
    Copy the full SHA
    680ab2e View commit details
    Browse the repository at this point in the history
  2. Solved Merged conflict

    ChanChunCheong committed Sep 29, 2018
    Copy the full SHA
    6b605ef View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    161a811 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    bb8d513 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2018

  1. Copy the full SHA
    75e3b55 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2018

  1. Copy the full SHA
    66ac1f8 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    bf3566f View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    9563a04 View commit details
    Browse the repository at this point in the history
  4. Merge pull request CS2113-AY1819S1-W13-3#17 from chelseyong/tasks

    Done AddTask + PriorityLevel with lots of refactoring
    chel-seyy committed Oct 5, 2018
    Copy the full SHA
    ed37435 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. Merge branch 'tasks' of https://github.com/CS2113-AY1819S1-W13-3/main

    …into Midv1.2
    
    # Conflicts:
    #	docs/DeveloperGuide.adoc
    ChanChunCheong committed Oct 9, 2018
    Copy the full SHA
    2e2fe18 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    38cf461 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    fdccd91 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Copy the full SHA
    3d3d6b9 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2018

  1. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/main/java/seedu/address/MainApp.java
    #	src/main/java/seedu/address/commons/core/Messages.java
    #	src/main/java/seedu/address/commons/events/ui/PersonPanelSelectionChangedEvent.java
    #	src/main/java/seedu/address/logic/LogicManager.java
    #	src/main/java/seedu/address/logic/commands/AddTaskCommand.java
    #	src/main/java/seedu/address/logic/commands/DeferDeadlineCommand.java
    #	src/main/java/seedu/address/logic/commands/DeleteCommand.java
    #	src/main/java/seedu/address/logic/parser/AddTaskCommandParser.java
    #	src/main/java/seedu/address/logic/parser/CliSyntax.java
    #	src/main/java/seedu/address/logic/parser/CompleteTaskCommandParser.java
    #	src/main/java/seedu/address/logic/parser/ParserUtil.java
    #	src/main/java/seedu/address/logic/parser/TaskBookParser.java
    #	src/main/java/seedu/address/model/AddressBook.java
    #	src/main/java/seedu/address/model/Model.java
    #	src/main/java/seedu/address/model/ModelManager.java
    #	src/main/java/seedu/address/model/deadline/Deadline.java
    #	src/main/java/seedu/address/model/task/PriorityLevel.java
    #	src/main/java/seedu/address/model/task/Task.java
    #	src/main/java/seedu/address/model/task/UniqueTaskList.java
    #	src/main/java/seedu/address/model/task/exceptions/DuplicateTaskException.java
    #	src/main/java/seedu/address/ui/BrowserPanel.java
    #	src/test/data/XmlAddressBookStorageTest/invalidAndValidPersonAddressBook.xml
    #	src/test/data/XmlAddressBookStorageTest/invalidPersonAddressBook.xml
    #	src/test/data/XmlSerializableAddressBookTest/duplicatePersonAddressBook.xml
    #	src/test/data/XmlSerializableAddressBookTest/invalidPersonAddressBook.xml
    #	src/test/data/XmlSerializableAddressBookTest/typicalPersonsAddressBook.xml
    #	src/test/data/XmlUtilTest/invalidPersonField.xml
    #	src/test/data/XmlUtilTest/missingPersonField.xml
    #	src/test/data/XmlUtilTest/tempAddressBook.xml
    #	src/test/data/XmlUtilTest/validAddressBook.xml
    #	src/test/data/XmlUtilTest/validPerson.xml
    #	src/test/java/guitests/guihandles/PersonCardHandle.java
    #	src/test/java/guitests/guihandles/PersonListPanelHandle.java
    #	src/test/java/seedu/address/TestApp.java
    #	src/test/java/seedu/address/commons/util/XmlUtilTest.java
    #	src/test/java/seedu/address/logic/LogicManagerTest.java
    #	src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
    #	src/test/java/seedu/address/logic/commands/AddCommandTest.java
    #	src/test/java/seedu/address/logic/commands/ClearCommandTest.java
    #	src/test/java/seedu/address/logic/commands/CommandTestUtil.java
    #	src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
    #	src/test/java/seedu/address/logic/commands/EditCommandTest.java
    #	src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
    #	src/test/java/seedu/address/logic/commands/FindCommandTest.java
    #	src/test/java/seedu/address/logic/commands/RedoCommandTest.java
    #	src/test/java/seedu/address/logic/commands/SelectCommandTest.java
    #	src/test/java/seedu/address/logic/commands/UndoCommandTest.java
    #	src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
    #	src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
    #	src/test/java/seedu/address/logic/parser/FindCommandParserTest.java
    #	src/test/java/seedu/address/logic/parser/SelectCommandParserTest.java
    #	src/test/java/seedu/address/logic/parser/TaskBookParserTest.java
    #	src/test/java/seedu/address/model/AddressBookTest.java
    #	src/test/java/seedu/address/model/ModelManagerTest.java
    #	src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java
    #	src/test/java/seedu/address/model/person/PersonTest.java
    #	src/test/java/seedu/address/model/person/UniquePersonListTest.java
    #	src/test/java/seedu/address/storage/StorageManagerTest.java
    #	src/test/java/seedu/address/storage/XmlSerializableAddressBookTest.java
    #	src/test/java/seedu/address/storage/XmlTaskBookStorageTest.java
    #	src/test/java/seedu/address/testutil/AddressBookBuilder.java
    #	src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
    #	src/test/java/seedu/address/testutil/PersonUtil.java
    #	src/test/java/seedu/address/testutil/TestUtil.java
    #	src/test/java/seedu/address/testutil/TypicalPersons.java
    #	src/test/java/seedu/address/ui/BrowserPanelTest.java
    #	src/test/java/seedu/address/ui/PersonCardTest.java
    #	src/test/java/seedu/address/ui/PersonListPanelTest.java
    #	src/test/java/seedu/address/ui/StatusBarFooterTest.java
    #	src/test/java/seedu/address/ui/testutil/GuiTestAssert.java
    #	src/test/java/systemtests/AddCommandSystemTest.java
    #	src/test/java/systemtests/AddressBookSystemTest.java
    #	src/test/java/systemtests/ClearCommandSystemTest.java
    #	src/test/java/systemtests/DeleteCommandSystemTest.java
    #	src/test/java/systemtests/EditCommandSystemTest.java
    #	src/test/java/systemtests/FindCommandSystemTest.java
    #	src/test/java/systemtests/HelpCommandSystemTest.java
    #	src/test/java/systemtests/ModelHelper.java
    #	src/test/java/systemtests/SampleDataTest.java
    #	src/test/java/systemtests/SelectCommandSystemTest.java
    #	src/test/java/systemtests/SystemTestSetupHelper.java
    ChanChunCheong committed Oct 17, 2018
    Copy the full SHA
    84e5418 View commit details
    Browse the repository at this point in the history
  2. made some changes

    ChanChunCheong committed Oct 17, 2018
    Copy the full SHA
    3910ee2 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    0c69692 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2018

  1. added back the photo

    ChanChunCheong committed Oct 18, 2018
    Copy the full SHA
    019568b View commit details
    Browse the repository at this point in the history
  2. removed test file

    ChanChunCheong committed Oct 18, 2018
    Copy the full SHA
    70c827d View commit details
    Browse the repository at this point in the history
  3. added photo

    ChanChunCheong committed Oct 18, 2018
    Copy the full SHA
    94694ea View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2018

  1. Copy the full SHA
    1bb2b69 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2018

  1. Added Tag Class

    ChanChunCheong committed Oct 23, 2018
    Copy the full SHA
    96ccee3 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    d31fdb5 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    cdcf60c View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    3a51c45 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    9f42a0b View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    8ac7882 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    cfa1636 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. Copy the full SHA
    3831af1 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    8db8e0b View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Solved SortTask.

    ChanChunCheong committed Oct 26, 2018
    Copy the full SHA
    1d1af7d View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    90665e9 View commit details
    Browse the repository at this point in the history
  3. Annnotated code

    ChanChunCheong committed Oct 26, 2018
    Copy the full SHA
    26d315a View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    cbc7391 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2018

  1. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/main/java/seedu/address/logic/LogicManager.java
    #	src/main/java/seedu/address/model/AddressBook.java
    #	src/main/java/seedu/address/model/Model.java
    #	src/main/java/seedu/address/model/ModelManager.java
    #	src/main/java/seedu/address/model/task/Task.java
    #	src/main/java/seedu/address/model/util/SampleDataUtil.java
    #	src/main/java/seedu/address/storage/XmlAdaptedTask.java
    #	src/main/java/seedu/address/ui/TaskCard.java
    
    Solved merge conflicts. Ensured checkstyle passes and all tests can be built with moduleCodes.
    ChanChunCheong committed Oct 27, 2018
    Copy the full SHA
    febeba6 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    32f5e45 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/main/java/seedu/address/model/ModelManager.java
    #	src/main/java/seedu/address/model/task/Task.java
    #	src/test/java/seedu/address/logic/commands/CommandTestUtil.java
    #	src/test/java/seedu/address/logic/commands/CompleteTaskCommandTest.java
    #	src/test/java/seedu/address/model/AddressBookTest.java
    #	src/test/java/seedu/address/storage/XmlAdaptedTaskTest.java
    #	src/test/java/seedu/address/testutil/TypicalTasks.java
    
    Solved merge conflict. Test and checkstyle running properly
    ChanChunCheong committed Oct 27, 2018
    Copy the full SHA
    f87c603 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2018

  1. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/main/java/seedu/address/model/AddressBook.java
    #	src/main/java/seedu/address/model/task/SortTaskList.java
    #	src/main/java/seedu/address/model/task/Task.java
    #	src/main/java/seedu/address/storage/XmlAdaptedTask.java
    #	src/test/java/seedu/address/logic/commands/CommandTestUtil.java
    #	src/test/java/seedu/address/storage/XmlAdaptedTaskTest.java
    #	src/test/java/seedu/address/testutil/TaskBuilder.java
    #	src/test/java/seedu/address/testutil/TypicalTasks.java
    ChanChunCheong committed Oct 28, 2018
    Copy the full SHA
    a3a5fb0 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

  1. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/test/java/seedu/address/testutil/TaskBuilder.java
    ChanChunCheong committed Oct 31, 2018
    Copy the full SHA
    5a28cca View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    f585d1c View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    e717b7c View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    ddfc7ab View commit details
    Browse the repository at this point in the history
  5. updated UG

    ChanChunCheong committed Oct 31, 2018
    Copy the full SHA
    0118105 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    aad46c9 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    2d6c8ff View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    c6dd7cf View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2018

  1. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	docs/UserGuide.adoc
    #	src/main/java/seedu/address/logic/commands/DeferDeadlineCommand.java
    ChanChunCheong committed Nov 1, 2018
    Copy the full SHA
    386a92b View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2018

  1. addtag

    ChanChunCheong committed Nov 3, 2018
    Copy the full SHA
    d7b1754 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/main/java/seedu/address/logic/LogicManager.java
    #	src/main/java/seedu/address/model/task/Task.java
    #	src/main/java/seedu/address/storage/XmlAdaptedTask.java
    ChanChunCheong committed Nov 7, 2018
    Copy the full SHA
    768d6cd View commit details
    Browse the repository at this point in the history
  2. Add_tag command

    ChanChunCheong committed Nov 7, 2018
    Copy the full SHA
    6a5dbeb View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    2efa0e7 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    0a13077 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2018

  1. Copy the full SHA
    43b900f View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a830c2f View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    41df381 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2018

  1. Copy the full SHA
    19dcfba View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/main/java/seedu/address/model/task/Deadline.java
    #	src/main/java/seedu/address/model/task/Task.java
    ChanChunCheong committed Nov 9, 2018
    Copy the full SHA
    3639606 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    87add76 View commit details
    Browse the repository at this point in the history
  4. Solved the deferdeadline which resulted in the sametask bug. Changed …

    …the way deferdeadline is implemented
    ChanChunCheong committed Nov 9, 2018
    Copy the full SHA
    9aae196 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2018

  1. DeferDeadline, RemoveTag, SelectTag, AddTag Command Parsers Tests.

    DeferDeadline, RemoveTag, SelectTag,  AddTag Command Tests.
    ChanChunCheong committed Nov 10, 2018
    Copy the full SHA
    a83f9df View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/main/java/seedu/address/logic/parser/ParserUtil.java
    #	src/main/java/seedu/address/model/task/Task.java
    #	src/test/java/seedu/address/logic/commands/CommandTestUtil.java
    ChanChunCheong committed Nov 10, 2018
    Copy the full SHA
    9bd51bb View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    62d6691 View commit details
    Browse the repository at this point in the history
  4. annotated authorship

    ChanChunCheong committed Nov 10, 2018
    Copy the full SHA
    379f0a3 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    27e74aa View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2018

  1. All test cases passed

    ChanChunCheong committed Nov 11, 2018
    Copy the full SHA
    0877a38 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    1b1655c View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main

    # Conflicts:
    #	src/test/java/seedu/address/logic/commands/CommandTestUtil.java
    #	src/test/java/seedu/address/testutil/TypicalIndexes.java
    ChanChunCheong committed Nov 11, 2018
    Copy the full SHA
    a6a3963 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    97b30ee View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    f9bb09d View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    2b8293b View commit details
    Browse the repository at this point in the history
  7. clean up code. Added Command Exception to deferdeadline to prevent de…

    …adline from exceeding 31/12/9999
    ChanChunCheong committed Nov 11, 2018
    Copy the full SHA
    4c9d4ec View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    576c572 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2018

  1. Copy the full SHA
    76a048b View commit details
    Browse the repository at this point in the history