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

Porting Tasks branch to Master branch #78

Closed
wants to merge 109 commits into from

Commits on Sep 17, 2018

  1. Configuration menu
    Copy the full SHA
    7f8cd8e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa283cf View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. Configuration menu
    Copy the full SHA
    86a4cdc View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2018

  1. Merge pull request #1 from chelseyong/master (UG & DG)

    Updated UG and DG for addTask + addDeadline
    chel-seyy authored Sep 22, 2018
    Configuration menu
    Copy the full SHA
    1a9c0eb View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2018

  1. Modified aboutUs page: Ks

    emobeany committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    361031b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    caa9970 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f998030 View commit details
    Browse the repository at this point in the history
  4. Updated UG and DG for viewDate + selectDate (#2)

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

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

    ChanChunCheong authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    51d2f4e View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    762993d View commit details
    Browse the repository at this point in the history
  12. ChanChunCheong

    ChanChunCheong authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    b478ae8 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    fe336f5 View commit details
    Browse the repository at this point in the history
  14. Edited the User Guide

    ChanChunCheong committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    89c1ac3 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    3586e92 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    fb43601 View commit details
    Browse the repository at this point in the history
  17. Added user stories

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

Commits on Sep 27, 2018

  1. checkstyle: add SingleSpaceSeparator

    Most of the code in our the code base only puts a single space between
    non-whitespace characters,
    
        "Like " + "this."
    
    It is highly likely that there will not be a case where we will need to
    put more than a single space between non-whitespace characters,
    
        "Like "  + "this."
    
    To enforce consistency throughout the code base, let's add the
    SingleSpaceSeparator module to our checkstyle configuration, and fix all
    of the existing violations in our code base.
    pyokagan authored and chel-seyy committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    d898884 View commit details
    Browse the repository at this point in the history
  2. HelpWindowTest: fix bogus "focus on another stage" code

    When run in head-full mode, HelpWindowTest fails with the following
    exception:
    
        seedu.address.ui.HelpWindowTest > focus_helpWindowNotFocused_focused FAILED
            java.lang.AssertionError at HelpWindowTest.java:64
    
    The line in question is from the following:
    
        assertFalse(helpWindow.getRoot().isFocused());
    
    which comes right after:
    
        // Focus on another stage to remove focus from the helpWindow
        FxToolkit.setupStage(Stage::requestFocus);
    
    However, despite what the comment claims, the call to
    FxToolkit.setupStage(...) does not "focus on another stage". This is
    because the Stage registered with TestFX is the HelpWindow stage itself.
    In other words, we are just requesting the HelpWindow to focus itself,
    which is the complete opposite of "removing focus from the helpWindow".
    
    This "focus on another stage" code was written in 1c6071f
    (HelpWindowTest: fix failing test in non-headless mode, 2018-04-16). At
    that point in time, the stage registered with TestFX _was_ "another
    stage"[1] and so the code was correct. However, in a42eded (Fix
    stalling HelpWindowTest, 2018-06-26) this was changed such that the
    stage registered with TestFX is the HelpWindow stage itself. Yet, the
    code was not modified to properly operate in the new world order[2].
    
    Fix this piece of code by creating a temporary stage to focus on, so
    that the goal of "removing focus from the helpWindow" is properly
    achieved.
    
    [1]: Somewhat-ish. The full story can be found in a42eded (Fix stalling
         HelpWindowTest, 2018-06-26).
    
    [2]: And obviously, the author did not run tests in head-full mode :-S
    pyokagan authored and chel-seyy committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    6483ac5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    612848f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7f43788 View commit details
    Browse the repository at this point in the history
  5. changed github account link

    ChanChunCheong authored and chel-seyy committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    2fbdbed View commit details
    Browse the repository at this point in the history
  6. Added comments to Commands to understand things better (CC)

    Modified comments to avoid checkstyle errors
    ChanChunCheong authored and chel-seyy committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    79b9a81 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6fab2a5 View commit details
    Browse the repository at this point in the history
  8. Updated UG and DG for viewDate + selectDate (#2)

    * Modified aboutUs page: Ks
    
    * Updated UG and DG for viewDate + selectDate
    emobeany authored and chel-seyy committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    7a4a5b7 View commit details
    Browse the repository at this point in the history
  9. About us - Chan Chun Cheong

    ChanChunCheong authored and chel-seyy committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    9f8481e View commit details
    Browse the repository at this point in the history
  10. Edited the UG + DG

    Edited the developer guide
    
    corrected developer guide
    
    Added user stories
    
    Minor changes to docs
    ChanChunCheong authored and chel-seyy committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    a79adae View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    5df5b71 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    8e9b99c View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9d07add View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4173a8e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    d1e26a5 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    74e1692 View commit details
    Browse the repository at this point in the history
  17. added Defer Deadline feature (#5)

    * Updated UG and DG for addTask + addDeadline
    
    * Added new feature: defer deadline
    chel-seyy authored Sep 27, 2018
    Configuration menu
    Copy the full SHA
    297e03f View commit details
    Browse the repository at this point in the history
  18. Minor modification in DG

    chel-seyy committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    c39cf42 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

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

    # Conflicts:
    #	docs/DeveloperGuide.adoc
    #	docs/UserGuide.adoc
    JeremyAw committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    0ebad8c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6c79912 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a7fa819 View commit details
    Browse the repository at this point in the history
  4. Minor adjustments to DG

    emobeany committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    71a8ec5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    646e1a0 View commit details
    Browse the repository at this point in the history
  6. Modifications made in UG, DG and added mockup UI

    Added mockup UI + a formatting mistake in DG (#6)
    
    * Minor adjustments to DG
    
    * Replaced AB Ui with TB mockup Ui
    
    edit pics
    chel-seyy committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    94f1ea7 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2018

  1. minor doc changes

    chel-seyy committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    d95ae71 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:
    #	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
    Configuration menu
    Copy the full SHA
    680ab2e View commit details
    Browse the repository at this point in the history
  3. Solved Merged conflict

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

Commits on Oct 1, 2018

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

    # Conflicts:
    #	docs/DeveloperGuide.adoc
    JeremyAw committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    532f2dd View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Configuration menu
    Copy the full SHA
    8e4020d View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2018

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

Commits on Oct 5, 2018

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

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

Commits on Oct 6, 2018

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

Commits on Oct 7, 2018

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

Commits on Oct 8, 2018

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

    …into milestone_feature
    
    # Conflicts:
    #	docs/DeveloperGuide.adoc
    JeremyAw committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    78bfc62 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6b4d651 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a3334e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

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

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

Commits on Oct 12, 2018

  1. Configuration menu
    Copy the full SHA
    6fe583d View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2018

  1. Configuration menu
    Copy the full SHA
    019ac83 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e7f645b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    153ade6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0b926ad View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2018

  1. Configuration menu
    Copy the full SHA
    1c741f2 View commit details
    Browse the repository at this point in the history
  2. Updated Milestone class by changing name of Order to Rank instead

    Added outline of how AddMilestoneCommand will work
    JeremyAw committed Oct 14, 2018
    Configuration menu
    Copy the full SHA
    d0e5869 View commit details
    Browse the repository at this point in the history
  3. Tests modified, incomplete

    chel-seyy committed Oct 14, 2018
    Configuration menu
    Copy the full SHA
    afa9747 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2018

  1. Configuration menu
    Copy the full SHA
    3f1e36c View commit details
    Browse the repository at this point in the history
  2. Added SelectDeadline

    emobeany committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    4e2ab5f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0d435db View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1 from chelseyong/tasks

    AddTask, CompleteTask are complete,Tests modified
    chel-seyy authored Oct 15, 2018
    Configuration menu
    Copy the full SHA
    b34f562 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #25 from chelseyong/master

    AddTask, CompleteTask, DeleteTask completed. More tests have to be refactored.
    chel-seyy authored Oct 15, 2018
    Configuration menu
    Copy the full SHA
    85accd2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a37293d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0fe3fe7 View commit details
    Browse the repository at this point in the history
  8. Updated UG Command Summary and Features to include add_milestone feature

    Updated DG Use case and User Story to include add_milestone feature
    JeremyAw committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    07685aa View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Configuration menu
    Copy the full SHA
    7301cb2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #28 from chelseyong/master

    Fixed checkstyles issues & removed checkstyleTest from travis check
    chel-seyy authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    4265ac9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e4ed764 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #23 from emobeany/milestone(Ks)

    Added Deadline Class + SelectDeadline
    chel-seyy authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    4e98293 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9ae90f9 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #20 from JeremyInElysium/milestone_feature

    Added Milestone class and AddMilestoneCommand feature
    chel-seyy authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    43f2558 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3c21ab4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3d3d6b9 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'tasks' of https://github.com/CS2113-AY1819S1-W13-3/main

    …into MileStoneV1.2
    
    # Conflicts:
    #	src/main/java/seedu/address/logic/LogicManager.java
    #	src/main/java/seedu/address/logic/parser/CliSyntax.java
    #	src/main/java/seedu/address/logic/parser/TaskBookParser.java
    #	src/test/java/seedu/address/logic/parser/TaskBookParserTest.java
    ChanChunCheong committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    77ea979 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3924d44 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6e38bd2 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #33 from chelseyong/folders-intact

    With the unrefactored folders + Modified changes for SelectDeadline &…
    chel-seyy authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    add3c73 View commit details
    Browse the repository at this point in the history
  13. Trying to resolve Eof error

    chel-seyy committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    c0914af View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    2e79494 View commit details
    Browse the repository at this point in the history
  15. Merge pull request #34 from chelseyong/folders-intact

    Resolving EOF bug [Travis]
    chel-seyy authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    b64595d View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    553759b View commit details
    Browse the repository at this point in the history
  17. Displayed invalid command format. Attempted to modify the model compo…

    …nent of DeferDeadlineCommand
    ChanChunCheong committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    37d1e68 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    1023862 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    f82d25e View commit details
    Browse the repository at this point in the history
  20. updated UGDG

    ChanChunCheong committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    e4e7b46 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    4d1b407 View commit details
    Browse the repository at this point in the history
  22. solved

    ChanChunCheong committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    b102488 View commit details
    Browse the repository at this point in the history
  23. Merge pull request #36 from chelseyong/merging-to-master

    Fixed checkstyle and moved main/java/../unrefactored folder
    chel-seyy authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    3bb8b9c View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    2a555ef View commit details
    Browse the repository at this point in the history
  25. 0 Checkstyle errors

    chel-seyy committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    25c586b View commit details
    Browse the repository at this point in the history