Skip to content
This repository has been archived by the owner on Jan 29, 2024. It is now read-only.

Sync master #49

Merged
merged 31 commits into from
Oct 16, 2023
Merged

Sync master #49

merged 31 commits into from
Oct 16, 2023

Commits on Oct 14, 2023

  1. Update script

    @lewis0811
    lewis0811 committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    da58227 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/Dev-Rebase' into Dev-Rebase

    @lewis0811
    lewis0811 committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    fcbda50 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2023

  1. Update Entities

    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    27967da View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/Dev-Rebase' into Dev-Rebase

    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    e36be00 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Dev-Rebase' of https://github.com/lewis0811/SWD-Laundry… 

    …-Backend into Dev-Rebase
    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    b32c8c4 View commit details
    Browse the repository at this point in the history

  4. Fixed orderBy

    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    e909193 View commit details
    Browse the repository at this point in the history

  5. minor change

    @k-nero
    k-nero committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    34ba528 View commit details
    Browse the repository at this point in the history

  6. Staff & Laundry update status flow

    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    3c12026 View commit details
    Browse the repository at this point in the history

  7. Paypal - working in draft

    @k-nero
    k-nero committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    1c5e513 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'k-nero:Dev-Rebase' into Dev-Rebase

    @lewis0811
    lewis0811 authored Oct 15, 2023
    Configuration menu
    Copy the full SHA
    a8749bd View commit details
    Browse the repository at this point in the history

  9. model binding

    @k-nero
    k-nero committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    21086f2 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'k-nero:Dev-Rebase' into Dev-Rebase

    @lewis0811
    lewis0811 authored Oct 15, 2023
    Configuration menu
    Copy the full SHA
    4af404f View commit details
    Browse the repository at this point in the history

  11. Update OrderHistory

    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    9c5de86 View commit details
    Browse the repository at this point in the history

  12. Update Program.cs

    @k-nero
    k-nero authored Oct 15, 2023
    Configuration menu
    Copy the full SHA
    27a27c9 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #46 from lewis0811/Dev-Rebase 

    Dev rebase
    @k-nero
    k-nero authored Oct 15, 2023
    Configuration menu
    Copy the full SHA
    0936aa1 View commit details
    Browse the repository at this point in the history

  14. finished payment

    @k-nero
    k-nero committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    7fb78cf View commit details
    Browse the repository at this point in the history

  15. MigrateData

    @k-nero
    k-nero committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    f4c8b89 View commit details
    Browse the repository at this point in the history

  16. Revert "MigrateData" 

    This reverts commit f4c8b89.
    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    5e3d7b5 View commit details
    Browse the repository at this point in the history

  17. Revert "Revert "MigrateData"" 

    This reverts commit 5e3d7b5.
    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    55d3b30 View commit details
    Browse the repository at this point in the history

  18. Revert "Update OrderHistory" 

    This reverts commit 9c5de86.
    @lewis0811
    lewis0811 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    a16855b View commit details
    Browse the repository at this point in the history

  19. small update

    @k-nero
    k-nero committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    32997dd View commit details
    Browse the repository at this point in the history

  20. PaypalController

    @k-nero
    k-nero committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    da1123b View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Merge branch 'k-nero:Dev-Rebase' into Dev-Rebase

    @lewis0811
    lewis0811 authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    1b19d9a View commit details
    Browse the repository at this point in the history

  2. Update Script.sql

    @lewis0811
    lewis0811 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    bcc8eff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Dev-Rebase' of https://github.com/lewis0811/SWD-Laundry… 

    …-Backend into Dev-Rebase
    @lewis0811
    lewis0811 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    f8bbea1 View commit details
    Browse the repository at this point in the history

  4. Modified model & controller names

    @lewis0811
    lewis0811 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    c65a105 View commit details
    Browse the repository at this point in the history

  5. Fix orderHistory

    @lewis0811
    lewis0811 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    e2f53cd View commit details
    Browse the repository at this point in the history

  6. Update BuildingController.cs

    @k-nero
    k-nero authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    75d6791 View commit details
    Browse the repository at this point in the history

  7. Update Program.cs

    @k-nero
    k-nero authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    5f29951 View commit details
    Browse the repository at this point in the history

  8. Update OrderHistoryQuery.cs

    @k-nero
    k-nero authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    52ccdd0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #48 from lewis0811/Dev-Rebase 

    Dev rebase
    @k-nero
    k-nero authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    4a6d6b2 View commit details
    Browse the repository at this point in the history