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

[CS2113-F10-3] FastScheduler #37

Open
wants to merge 165 commits into
base: master
Choose a base branch
from
Open

[CS2113-F10-3] FastScheduler #37

wants to merge 165 commits into from

Commits on Mar 5, 2021

  1. Set theme jekyll-theme-cayman

    @lihaoyangML
    lihaoyangML committed Mar 5, 2021
    Configuration menu
    Copy the full SHA
    48570d8 View commit details
    Browse the repository at this point in the history

  2. update haoyang name

    @lihaoyangML
    lihaoyangML committed Mar 5, 2021
    Configuration menu
    Copy the full SHA
    c5fe8d9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from lihaoyangML/branch-1 

    update haoyang name
    @lihaoyangML
    lihaoyangML authored Mar 5, 2021
    Configuration menu
    Copy the full SHA
    70a0b30 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. update justina name

    @justinaquak
    justinaquak authored Mar 17, 2021
    Configuration menu
    Copy the full SHA
    fd4d1fa View commit details
    Browse the repository at this point in the history

  2. Update Jing Feng's name

    @cloudy3
    cloudy3 committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    0d4f5a1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #11 from cloudy3/add-CheahJingFeng-info 

    Update Jing Feng's name
    @cloudy3
    cloudy3 authored Mar 17, 2021
    Configuration menu
    Copy the full SHA
    44f896d View commit details
    Browse the repository at this point in the history

  4. Add File Manager

    @cloudy3
    cloudy3 committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    e2d421a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #12 from cloudy3/add-FileManager 

    Add File Manager
    @cloudy3
    cloudy3 authored Mar 17, 2021
    Configuration menu
    Copy the full SHA
    fbf55c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. implement some public code, add employee, add employee schedule,drop … 

    …employee schedule
    @lihaoyangML
    lihaoyangML committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    c65b94b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from lihaoyangML/branch-1 

    implement my parts and some public code
    @lihaoyangML
    lihaoyangML authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    140d0eb View commit details
    Browse the repository at this point in the history

  3. add view employee availability function

    @justinaquak
    justinaquak committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    c180c73 View commit details
    Browse the repository at this point in the history

  4. Fix Java naming convention

    @cloudy3
    cloudy3 committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    de75ca7 View commit details
    Browse the repository at this point in the history

  5. Fix Java naming convention

    @cloudy3
    cloudy3 committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    5ad3294 View commit details
    Browse the repository at this point in the history

  6. Implement FileManager and DataParser

    @cloudy3
    cloudy3 committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    594d02a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #14 from cloudy3/master 

    Add File Manager and Data Parser
    @cloudy3
    cloudy3 authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    ae4186b View commit details
    Browse the repository at this point in the history

  8. Closes #6, closes #7, closes #10

    @cloudy3
    cloudy3 committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    1c0f327 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #15 from cloudy3/master 

    Closes #6, closes #7, closes #10
    @cloudy3
    cloudy3 authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    30a0d78 View commit details
    Browse the repository at this point in the history

  10. Update AboutUs.md

    @beaniestanley
    beaniestanley authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    ef1b8c9 View commit details
    Browse the repository at this point in the history

  11. Add Shift class

    @beaniestanley
    beaniestanley committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    ffad864 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp

    @beaniestanley
    beaniestanley committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    a85b6c4 View commit details
    Browse the repository at this point in the history

  13. Revert "Add Shift class" 

    This reverts commit ffad864.
    @beaniestanley
    beaniestanley committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    7c80058 View commit details
    Browse the repository at this point in the history

  14. Add Shift class

    @beaniestanley
    beaniestanley committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    87689cd View commit details
    Browse the repository at this point in the history

  15. Add addShift, assignShift and unassignShift methods

    @beaniestanley
    beaniestanley committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    185a796 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. add view all shifts and view one shift functionality

    @justinaquak
    justinaquak committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    d095ff3 View commit details
    Browse the repository at this point in the history

  2. add view all shifts

    @justinaquak
    justinaquak committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    1b745f8 View commit details
    Browse the repository at this point in the history

  3. add view one shift

    @justinaquak
    justinaquak committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    28f473e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'view'

    @justinaquak
    justinaquak committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    1730904 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #16 from justinaquak/view 

    add view one shift and view all shifts
    @justinaquak
    justinaquak authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    6cd5ff6 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2021

  1. Fix LocalDate formatting

    @beaniestanley
    beaniestanley committed Mar 20, 2021
    Configuration menu
    Copy the full SHA
    aea1ad7 View commit details
    Browse the repository at this point in the history

  2. Fix assignEmployee and unassignEmployee

    @beaniestanley
    beaniestanley committed Mar 20, 2021
    Configuration menu
    Copy the full SHA
    423ad44 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from AY2021S2-CS2113-F10-3/master 

    Merge from main
    @beaniestanley
    beaniestanley authored Mar 20, 2021
    Configuration menu
    Copy the full SHA
    ab2f543 View commit details
    Browse the repository at this point in the history

  4. Add braces for for-loop

    @beaniestanley
    beaniestanley committed Mar 20, 2021
    Configuration menu
    Copy the full SHA
    483ebb9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #17 from beaniestanley/master 

    Add braces for for-loop
    @beaniestanley
    beaniestanley authored Mar 20, 2021
    Configuration menu
    Copy the full SHA
    6f0f118 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp

    @justinaquak
    justinaquak committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    e2cbfcb View commit details
    Browse the repository at this point in the history

  2. Update gradle

    @cloudy3
    cloudy3 committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    c23ed81 View commit details
    Browse the repository at this point in the history

  3. Fix bugs in case statement

    @cloudy3
    cloudy3 committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    3d48ba6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18 from cloudy3/master 

    Fix case statement bugs
    @cloudy3
    cloudy3 authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    1267368 View commit details
    Browse the repository at this point in the history

  5. Fix addShift

    @beaniestanley
    beaniestanley committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    cc8fc01 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/master'

    @beaniestanley
    beaniestanley committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    0dfa6b3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19 from beaniestanley/master 

    Fix addShift
    @beaniestanley
    beaniestanley authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    4d4dd30 View commit details
    Browse the repository at this point in the history

  8. edit view all shifts and view one shift

    @justinaquak
    justinaquak committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    fa03911 View commit details
    Browse the repository at this point in the history

  9. Fix assignEmployee and unassignEmployee

    @beaniestanley
    beaniestanley committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    f43acf8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #20 from beaniestanley/master 

    Fix assignEmployee and unassignEmployee
    @beaniestanley
    beaniestanley authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    38f19c0 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp 

    # Conflicts:
#	src/main/java/controller/AppController.java
    @justinaquak
    justinaquak committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    8720f81 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp

    @justinaquak
    justinaquak committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    4927de9 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #21 from justinaquak/master 

    fix view one shift and view all shifts
    @justinaquak
    justinaquak authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    4bf479b View commit details
    Browse the repository at this point in the history

  14. Add getShiftDatetoString method

    @beaniestanley
    beaniestanley committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    54f5b79 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #22 from beaniestanley/master 

    Add getShiftDatetoString method
    @beaniestanley
    beaniestanley authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    24cf0a0 View commit details
    Browse the repository at this point in the history

  16. edit view one shift

    @justinaquak
    justinaquak committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    e605a2f View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp

    @justinaquak
    justinaquak committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    946245a View commit details
    Browse the repository at this point in the history

  18. Merge pull request #23 from justinaquak/master 

    fix view one shift
    @justinaquak
    justinaquak authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    2fa57b4 View commit details
    Browse the repository at this point in the history

  19. add constraints on schedule

    @lihaoyangML
    lihaoyangML committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    ad2e7ce View commit details
    Browse the repository at this point in the history

  20. update schedule

    @lihaoyangML
    lihaoyangML committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    e1d5286 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #24 from lihaoyangML/branch-2 

    add constraints for schedule
    @lihaoyangML
    lihaoyangML authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    0aea769 View commit details
    Browse the repository at this point in the history

  22. add help, ui and dropEmployee

    @lihaoyangML
    lihaoyangML committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    6d6cff3 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #25 from lihaoyangML/branch-3 

    add help, ui and dropEmployee
    @lihaoyangML
    lihaoyangML authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    0c424eb View commit details
    Browse the repository at this point in the history

  24. implement get employee object by name

    @lihaoyangML
    lihaoyangML committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    889d593 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #26 from lihaoyangML/branch-3 

    implement get employee object by name
    @lihaoyangML
    lihaoyangML authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    ad76d57 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. add view One Shift DG

    @justinaquak
    justinaquak committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    ab420bf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #29 from justinaquak/master 

    add view One Shift DG
    @justinaquak
    justinaquak authored Mar 24, 2021
    Configuration menu
    Copy the full SHA
    6ecb185 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. add DG for addSchedule

    @lihaoyangML
    lihaoyangML committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    42d2deb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #30 from lihaoyangML/branch-4 

    add DG for addSchedule
    @lihaoyangML
    lihaoyangML authored Mar 25, 2021
    Configuration menu
    Copy the full SHA
    9c09b64 View commit details
    Browse the repository at this point in the history

  3. Improve description for addSchedule in DG

    @lihaoyangML
    lihaoyangML authored Mar 25, 2021
    Configuration menu
    Copy the full SHA
    47d003d View commit details
    Browse the repository at this point in the history

  4. Add assignEmployee DG, improve assignEmployee and unassignEmployee

    @beaniestanley
    beaniestanley committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    59e8fe2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #31 from beaniestanley/master 

    Add assignEmployee DG, improve assignEmployee and unassignEmployee
    @beaniestanley
    beaniestanley authored Mar 25, 2021
    Configuration menu
    Copy the full SHA
    9c88ebe View commit details
    Browse the repository at this point in the history

  6. Update assignEmployee sequence diagram

    @beaniestanley
    beaniestanley committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    6f391c6 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #32 from beaniestanley/master 

    Update assignEmployee sequence diagram
    @beaniestanley
    beaniestanley authored Mar 25, 2021
    Configuration menu
    Copy the full SHA
    74dcf57 View commit details
    Browse the repository at this point in the history

  8. no message

    @cloudy3
    cloudy3 committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    fbfbdf5 View commit details
    Browse the repository at this point in the history

  9. Implement file handling for Shifts

    @cloudy3
    cloudy3 committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    99294c6 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #34 from cloudy3/master 

    Implement File Handling for Shifts
    @cloudy3
    cloudy3 authored Mar 25, 2021
    Configuration menu
    Copy the full SHA
    9158713 View commit details
    Browse the repository at this point in the history

  11. disable drop employee to prevent bug

    @lihaoyangML
    lihaoyangML committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    5ce8bc4 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #35 from lihaoyangML/branch-5 

    disable drop employee to prevent bug
    @lihaoyangML
    lihaoyangML authored Mar 25, 2021
    Configuration menu
    Copy the full SHA
    cbf375e View commit details
    Browse the repository at this point in the history

  13. Updated Developer Guide

    @cloudy3
    cloudy3 committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    33c973f View commit details
    Browse the repository at this point in the history

  14. Merge pull request #36 from cloudy3/master 

    Updated Developer Guide
    @cloudy3
    cloudy3 authored Mar 25, 2021
    Configuration menu
    Copy the full SHA
    c25b1b6 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. Minor changes

    @cloudy3
    cloudy3 committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    4dfa5c9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #37 from cloudy3/master 

    Minor changes
    @cloudy3
    cloudy3 authored Mar 26, 2021
    Configuration menu
    Copy the full SHA
    dae5973 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. Update Developer Guide

    @cloudy3
    cloudy3 committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    ae5e37c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #38 from cloudy3/master 

    Update Developer Guide
    @cloudy3
    cloudy3 authored Mar 29, 2021
    Configuration menu
    Copy the full SHA
    5f1cf08 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp

    @justinaquak
    justinaquak committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    2b9d0bc View commit details
    Browse the repository at this point in the history

  2. add ignore case functionality

    @justinaquak
    justinaquak committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    a88c6ba View commit details
    Browse the repository at this point in the history

  3. Move Shift methods from AppController into ShiftController

    @beaniestanley
    beaniestanley committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    02ecb1a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #39 from beaniestanley/master 

    Move Shift methods from AppController into ShiftController
    @beaniestanley
    beaniestanley authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    2210d64 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #40 from justinaquak/master 

    add case insensitivity functionality
    @justinaquak
    justinaquak authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    b2014af View commit details
    Browse the repository at this point in the history

  6. Update ShiftController methods

    @beaniestanley
    beaniestanley committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    da9816a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #41 from beaniestanley/master 

    Update ShiftController methods
    @beaniestanley
    beaniestanley authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    c8d2f8f View commit details
    Browse the repository at this point in the history

  8. Update assignEmployee sequence diagram

    @beaniestanley
    beaniestanley committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    9a161dc View commit details
    Browse the repository at this point in the history

  9. Merge pull request #42 from beaniestanley/master 

    Update assignEmployee sequence diagram
    @beaniestanley
    beaniestanley authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    666942a View commit details
    Browse the repository at this point in the history

  10. Fix Loading of shifts

    @cloudy3
    cloudy3 committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    d550070 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #43 from cloudy3/master 

    Fix Loading of shifts
    @cloudy3
    cloudy3 authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    dd31d72 View commit details
    Browse the repository at this point in the history

  12. more OOP for employee features, remove drop employee, improve UI expe… 

    …rience
    @lihaoyangML
    lihaoyangML committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    847aea3 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #44 from lihaoyangML/branch-6 

    more OOP for employee features, remove drop employee, improve UI expe…
    @lihaoyangML
    lihaoyangML authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    bd849b8 View commit details
    Browse the repository at this point in the history

  14. Enable Asserter

    @cloudy3
    cloudy3 committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    f80d03b View commit details
    Browse the repository at this point in the history

  15. Merge pull request #45 from cloudy3/master 

    Enable Asserter
    @cloudy3
    cloudy3 authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    ffe6b0e View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2021

  1. jar release resources for v1.0

    @lihaoyangML
    lihaoyangML committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    013ec74 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #46 from lihaoyangML/branch-7 

    jar release resources for v1.0
    @lihaoyangML
    lihaoyangML authored Mar 31, 2021
    Configuration menu
    Copy the full SHA
    d978641 View commit details
    Browse the repository at this point in the history

  3. add assertion for dropSchedule

    @lihaoyangML
    lihaoyangML committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    e4c5e6a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #47 from lihaoyangML/branch-7 

    add assertion for dropSchedule
    @lihaoyangML
    lihaoyangML authored Mar 31, 2021
    Configuration menu
    Copy the full SHA
    0ed577b View commit details
    Browse the repository at this point in the history

  5. Add assertions for positive vacancies and non-null employees

    @cloudy3
    cloudy3 committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    4edf659 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #48 from cloudy3/master 

    Add assertions for positive vacancies and non-null employees
    @cloudy3
    cloudy3 authored Mar 31, 2021
    Configuration menu
    Copy the full SHA
    a3fa77d View commit details
    Browse the repository at this point in the history

  7. update UG for add schedule feature

    @lihaoyangML
    lihaoyangML committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    40f519b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #49 from lihaoyangML/branch-8 

    update UG for add schedule feature
    @lihaoyangML
    lihaoyangML authored Mar 31, 2021
    Configuration menu
    Copy the full SHA
    12e4c02 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2021

  1. add introduction to UG

    @justinaquak
    justinaquak committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    3e87c58 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp

    @justinaquak
    justinaquak committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    9262623 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #50 from justinaquak/master 

    add intro in ug
    @justinaquak
    justinaquak authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    447605c View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2021

  1. add username

    @justinaquak
    justinaquak committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    4e5a295 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #51 from justinaquak/master 

    add username
    @justinaquak
    justinaquak authored Apr 3, 2021
    Configuration menu
    Copy the full SHA
    92b8f44 View commit details
    Browse the repository at this point in the history

  3. Update User Guide

    @cloudy3
    cloudy3 committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    df450f5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #89 from cloudy3/master 

    Update User Guide
    @cloudy3
    cloudy3 authored Apr 3, 2021
    Configuration menu
    Copy the full SHA
    036982e View commit details
    Browse the repository at this point in the history

  5. Fix minor bugs

    @cloudy3
    cloudy3 committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    41321d5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #90 from cloudy3/master 

    Fix minor bugs
    @cloudy3
    cloudy3 authored Apr 3, 2021
    Configuration menu
    Copy the full SHA
    dcfe79e View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

  1. Reformat all java files to fit coding standards

    @cloudy3
    cloudy3 committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    004aba0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #91 from cloudy3/master 

    Reformat all java files to fit coding standards
    @cloudy3
    cloudy3 authored Apr 6, 2021
    Configuration menu
    Copy the full SHA
    cf37b6b View commit details
    Browse the repository at this point in the history

  3. Minor changes

    @cloudy3
    cloudy3 committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    a0c789b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #92 from cloudy3/master 

    Minor changes
    @cloudy3
    cloudy3 authored Apr 6, 2021
    Configuration menu
    Copy the full SHA
    1695f29 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Add PPP

    @cloudy3
    cloudy3 committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    4a76921 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #93 from cloudy3/master 

    Add PPP
    @cloudy3
    cloudy3 authored Apr 7, 2021
    Configuration menu
    Copy the full SHA
    9736683 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2021

  1. Resolve the bug that some months (eg Feb) can have 31 days in add sch… 

    …edule
    @lihaoyangML
    lihaoyangML committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    7c8259a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #97 from lihaoyangML/branch-9 

    Resolve the bug that some months (eg Feb) can have 31 days
    @lihaoyangML
    lihaoyangML authored Apr 8, 2021
    Configuration menu
    Copy the full SHA
    9683033 View commit details
    Browse the repository at this point in the history

  3. prevent duplicated employee or schedule from being added

    @lihaoyangML
    lihaoyangML committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    b9ad24c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #98 from lihaoyangML/branch-9 

    prevent duplicated employee or schedule from being added
    @lihaoyangML
    lihaoyangML authored Apr 8, 2021
    Configuration menu
    Copy the full SHA
    9a95211 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. Minor changes

    @cloudy3
    cloudy3 committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    9e4edfa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #99 from cloudy3/master 

    Minor changes
    @cloudy3
    cloudy3 authored Apr 9, 2021
    Configuration menu
    Copy the full SHA
    866cd7a View commit details
    Browse the repository at this point in the history

  3. draft my PPP

    @lihaoyangML
    lihaoyangML committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    5758e0b View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2021

  1. PPP draft v2

    @lihaoyangML
    lihaoyangML committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    23b213b View commit details
    Browse the repository at this point in the history

  2. slight update to PPP

    @lihaoyangML
    lihaoyangML committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    42670e5 View commit details
    Browse the repository at this point in the history

  3. slight update to PPP

    @lihaoyangML
    lihaoyangML committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    be09683 View commit details
    Browse the repository at this point in the history

  4. Add and edit methods in ShiftController. Fix #54 #55 #56 #57 #58 #59 … 

    …$60 $69 #70 #71 #74 #77 #78 #84 #86 #87 #88
    @beaniestanley
    beaniestanley committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    268b6b3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #100 from beaniestanley/master 

    Add and edit methods in ShiftController. Fix #54 #55 #56 #57 #58 #59 …
    @beaniestanley
    beaniestanley authored Apr 11, 2021
    Configuration menu
    Copy the full SHA
    0b738f2 View commit details
    Browse the repository at this point in the history

  6. Minor update

    @beaniestanley
    beaniestanley committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    2758a69 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #101 from beaniestanley/master 

    Minor update
    @beaniestanley
    beaniestanley authored Apr 11, 2021
    Configuration menu
    Copy the full SHA
    2c028aa View commit details
    Browse the repository at this point in the history

  8. Remove import

    @beaniestanley
    beaniestanley committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    a875321 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. Update DG

    @beaniestanley
    beaniestanley committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    5d15e03 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #102 from beaniestanley/master 

    Update DG and remove unused import
    @beaniestanley
    beaniestanley authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    aa07786 View commit details
    Browse the repository at this point in the history

  3. Update UG

    @beaniestanley
    beaniestanley committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    3e0f915 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp … 

    …into branch-10
    @lihaoyangML
    lihaoyangML committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    2f4f82f View commit details
    Browse the repository at this point in the history

  5. Add PPP

    @beaniestanley
    beaniestanley committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    4241bd7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #103 from beaniestanley/master 

    Update UG and add PPP
    @beaniestanley
    beaniestanley authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    c384f0e View commit details
    Browse the repository at this point in the history

  7. update code and PPP

    @lihaoyangML
    lihaoyangML committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    cc189dc View commit details
    Browse the repository at this point in the history

  8. update team profile

    @lihaoyangML
    lihaoyangML committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    2c03318 View commit details
    Browse the repository at this point in the history

  9. test PPP page

    @lihaoyangML
    lihaoyangML committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    532e236 View commit details
    Browse the repository at this point in the history

  10. fixes #79, #76, #75, #68, #67, #66, #65, #52

    @cloudy3
    cloudy3 committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    8fb32fa View commit details
    Browse the repository at this point in the history

  11. Merge pull request #104 from cloudy3/master 

    fixes #79, #76, #75, #68, #67, #66, #65, #52
    @cloudy3
    cloudy3 authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    1b81fed View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp … 

    …into branch-10
    @lihaoyangML
    lihaoyangML committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    dda59ef View commit details
    Browse the repository at this point in the history

  13. delete extra person in about us

    @lihaoyangML
    lihaoyangML committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    09c5086 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #105 from lihaoyangML/branch-10 

    delete extra person in about us
    @lihaoyangML
    lihaoyangML authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    edd24b0 View commit details
    Browse the repository at this point in the history

  15. Update formatting for PPP

    @beaniestanley
    beaniestanley authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    1c16bc4 View commit details
    Browse the repository at this point in the history

  16. Update formating for PPP

    @beaniestanley
    beaniestanley authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    c6381b5 View commit details
    Browse the repository at this point in the history

  17. Update AboutUs.md 

    update a broken link spotted
    @lihaoyangML
    lihaoyangML authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    db724b5 View commit details
    Browse the repository at this point in the history

  18. Update PPP formatting

    @beaniestanley
    beaniestanley authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    10d135a View commit details
    Browse the repository at this point in the history

  19. add ppp

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    dfa7e9d View commit details
    Browse the repository at this point in the history

  20. edit ppp

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    37aace8 View commit details
    Browse the repository at this point in the history

  21. edit ppp

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    6eff154 View commit details
    Browse the repository at this point in the history

  22. edit ppp

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    c9feb8e View commit details
    Browse the repository at this point in the history

  23. edit ppp

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    8163afb View commit details
    Browse the repository at this point in the history

  24. Merge pull request #106 from justinaquak/master 

    peepeepee
    @justinaquak
    justinaquak authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    11d2d76 View commit details
    Browse the repository at this point in the history

  25. edit shift

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    d26b957 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #107 from justinaquak/master 

    edit shift
    @justinaquak
    justinaquak authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    39fa0b8 View commit details
    Browse the repository at this point in the history

  27. edit shift again

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    6aa5ab9 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #108 from justinaquak/master 

    edit shift again
    @justinaquak
    justinaquak authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    87c19eb View commit details
    Browse the repository at this point in the history

  29. edit shift

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    328ebf2 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    b3e2aec View commit details
    Browse the repository at this point in the history

  31. Merge pull request #109 from justinaquak/master 

    edit shift
    @justinaquak
    justinaquak authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    7d9436a View commit details
    Browse the repository at this point in the history

  32. edit contribution

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    a0d3ec1 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-3/tp

    @justinaquak
    justinaquak committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    b4f39f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. Merge pull request #110 from justinaquak/master 

    edit contributions SORRY STANLEY :(
    @justinaquak
    justinaquak authored Apr 13, 2021
    Configuration menu
    Copy the full SHA
    fce449e View commit details
    Browse the repository at this point in the history