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

Integrations v1.4 #211

Merged
55 commits merged into from Nov 7, 2019
Merged

Integrations v1.4 #211

55 commits merged into from Nov 7, 2019

Commits on Oct 31, 2019

  1. Merge pull request #146 from AY1920S1-CS2103T-F12-1/integrations 

    Integrations v1.3.1
    WeomuCat authored Oct 31, 2019
    Configuration menu
    Copy the full SHA
    5d602ab View commit details
    Browse the repository at this point in the history

  2. Merge pull request #145 from AY1920S1-CS2103T-F12-1/integrations 

    Release v1.3.1
    WeomuCat authored Oct 31, 2019
    Configuration menu
    Copy the full SHA
    d6231f0 View commit details
    Browse the repository at this point in the history

  3. Fix UG calendar command

    WeomuCat committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    2298db0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #147 from WeomuCat/branch-docs 

     Fix UG calendar command
    WeomuCat authored Oct 31, 2019
    Configuration menu
    Copy the full SHA
    04eb48a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #148 from AY1920S1-CS2103T-F12-1/branch-docs 

     Fix UG calendar command
    WeomuCat authored Oct 31, 2019
    Configuration menu
    Copy the full SHA
    962e162 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2019

  1. removed system.out

    @Kyzure
    Kyzure committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    e4fe037 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F12-1/main 

    # Conflicts:
#	src/main/java/seedu/address/ui/panel/calendar/CalendarPanel.java
    @Kyzure
    Kyzure committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    a9ea17e View commit details
    Browse the repository at this point in the history

  3. Fixed issues regarding UI indexing with new logic

    @Kyzure
    Kyzure committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    7639fa8 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2019

  1. Refine CommandParser Tests

    WeomuCat committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    bd83c49 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. Updated Cheng Geng's PPP for completeness.

    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    bc23575 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #149 from Kyzure/master 

    Fixed issues regarding UI Indexing
    @Kyzure
    Kyzure authored Nov 4, 2019
    Configuration menu
    Copy the full SHA
    967344c View commit details
    Browse the repository at this point in the history

  3. Changed Cheng Geng's PPP file format from adoc to md.

    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    468968b View commit details
    Browse the repository at this point in the history

  4. Revert "Changed Cheng Geng's PPP file format from adoc to md." 

    This reverts commit 468968b.
    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    9457657 View commit details
    Browse the repository at this point in the history

  5. Updated Cheng Geng's PPP and part of the Developer Guide to fix a typo.

    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    95b3a14 View commit details
    Browse the repository at this point in the history

  6. Updated the Developer Guide to have clearer explanations of when comm… 

    …ands are unaffected by undo and redo
    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    099fd13 View commit details
    Browse the repository at this point in the history

  7. Revert "Updated the Developer Guide to have clearer explanations of w… 

    …hen commands are unaffected by undo and redo"

This reverts commit 099fd13.
    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    85453bd View commit details
    Browse the repository at this point in the history

  8. Updated the User Guide to more clearly specify that UI-related commad… 

    …ns are unaffected by undo and redo.
    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    c32d395 View commit details
    Browse the repository at this point in the history

  9. Updated Cheng Geng's PPP to match the changes to the User Guide.

    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    1b81f14 View commit details
    Browse the repository at this point in the history

  10. Changed the link in the excerpt of the User Guide in Cheng Geng's PPP… 

    … to point properly to the main branch's version of the User Guide.
    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    bff7497 View commit details
    Browse the repository at this point in the history

  11. Changed the User Guide and Cheng Geng's PPP to remove a formatting error

    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    debb60b View commit details
    Browse the repository at this point in the history

  12. Edited the User Guide to explicitly state the commands that undo and … 

    …redo will affect.
    @ChengGeng97
    ChengGeng97 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    6f8b78a View commit details
    Browse the repository at this point in the history

  13. Merge pull request #209 from ChengGeng97/branch-docs 

    Branch docs
    @ChengGeng97
    ChengGeng97 authored Nov 4, 2019
    Configuration menu
    Copy the full SHA
    5602348 View commit details
    Browse the repository at this point in the history

  14. Fixed certain issues given by testers. 

    Includes: fixing Upcoming view, app name, app icon and other minor issues.
    @Kyzure
    Kyzure committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    582eef7 View commit details
    Browse the repository at this point in the history

  15. Fixed certain issues.

    @Kyzure
    Kyzure committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    5ad576c View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2019

  1. Refactor ModelManager to fix #175. 

    - Fix off by one error #189
- Tests not done
    WeomuCat committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    2ca5703 View commit details
    Browse the repository at this point in the history

  2. Solved Tagging issue using string length way. Only supports minimum s… 

    …creen size, hence will not look perfect at full screen size, but still works fine.
    @Kyzure
    Kyzure committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    d5e80af View commit details
    Browse the repository at this point in the history

  3. Minor CSS issues.

    @Kyzure
    Kyzure committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    d721a58 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'branch-docs' of https://github.com/AY1920S1-CS2103T-F12… 

    …-1/main
    @Kyzure
    Kyzure committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    1297040 View commit details
    Browse the repository at this point in the history

  5. Added java docs and fixed certain documentation issues, as well as ot… 

    …her minor issues.
    @Kyzure
    Kyzure committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    3f3ee43 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #213 from Kyzure/master 

    Fixed most of the issues issued to me.
    @Kyzure
    Kyzure authored Nov 5, 2019
    Configuration menu
    Copy the full SHA
    96074b9 View commit details
    Browse the repository at this point in the history

  7. Clean up DateTime 

    - Fix add_event & delete_event tests.
    WeomuCat committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    3c78fbb View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main-branch-ui' into integrations

    WeomuCat committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    0d000d9 View commit details
    Browse the repository at this point in the history

  9. Refactor UniqueList to UniqueOrderedSet

    WeomuCat committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    3546926 View commit details
    Browse the repository at this point in the history

  10. Fix checks 

    - Add hashcode to DateTime
    WeomuCat committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    c73b21b View commit details
    Browse the repository at this point in the history

  11. Added Unit Testing for Calendar Commands.

    @Kyzure
    Kyzure committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    354d907 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #214 from Kyzure/master 

    Added Unit Testing for Calendar Commands.
    @Kyzure
    Kyzure authored Nov 5, 2019
    Configuration menu
    Copy the full SHA
    238c26e View commit details
    Browse the repository at this point in the history

  13. Added edit_event tests.

    WeomuCat committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    a23d892 View commit details
    Browse the repository at this point in the history

  14. Added stub and test for Uiamanger.

    @Kyzure
    Kyzure committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    109ae17 View commit details
    Browse the repository at this point in the history

  15. Combine some commands with their builders

    WeomuCat committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    cc405b9 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. Fix bug regarding events importing

    @marcusteh1238
    marcusteh1238 committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    8bb6fc9 View commit details
    Browse the repository at this point in the history

  2. Clean up code

    @marcusteh1238
    marcusteh1238 committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    aee4772 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #218 from marcusteh1238/branc-ics-bug-fixes 

    Fix Events not showing up with description bug
    @marcusteh1238
    marcusteh1238 authored Nov 6, 2019
    Configuration menu
    Copy the full SHA
    bdc0134 View commit details
    Browse the repository at this point in the history

  4. Refactoring CalendarDate

    WeomuCat committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    d6d0008 View commit details
    Browse the repository at this point in the history

  5. Added Test for CalendarDate and certain UiLogic that is abstracted ou… 

    …t into stubs.
    @Kyzure
    Kyzure committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    26a26df View commit details
    Browse the repository at this point in the history

  6. Add calendar day & month parser tests

    WeomuCat committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    3e5ecdc View commit details
    Browse the repository at this point in the history

  7. Add EventSource start, end, remind check

    WeomuCat committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    62734ed View commit details
    Browse the repository at this point in the history

  8. Remove redundant files

    WeomuCat committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    ffb4b6c View commit details
    Browse the repository at this point in the history

  9. Fix checkstyle

    WeomuCat committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    0ecf9e7 View commit details
    Browse the repository at this point in the history

  10. Fix CommandManager exception handling

    WeomuCat committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    c04d897 View commit details
    Browse the repository at this point in the history

  11. Added TimelineWeekView Stub and tests for it.

    @Kyzure
    Kyzure committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    081fb43 View commit details
    Browse the repository at this point in the history

  12. Edited Sequence Diagram

    @Kyzure
    Kyzure committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    844ede7 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. Merge branch 'main-branch-ics-week12' into integrations

    WeomuCat committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    27cab9d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #219 from Kyzure/master 

    Add Tests for Ui and other parts.
    WeomuCat authored Nov 7, 2019
    Configuration menu
    Copy the full SHA
    125de93 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main-branch-ui' into integrations

    WeomuCat committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    aa5200e View commit details
    Browse the repository at this point in the history

  4. Fix CalendarDateTest

    WeomuCat committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    14d6fa4 View commit details
    Browse the repository at this point in the history