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

B 20654 in #13679

Merged
merged 31 commits into from
Sep 11, 2024
Merged

B 20654 in #13679

merged 31 commits into from
Sep 11, 2024

Commits on Sep 9, 2024

  1. Merge branch 'main' of github.com:transcom/mymove into servicesTest

    @r-mettler
    r-mettler committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    766af94 View commit details
    Browse the repository at this point in the history

  2. initial commit, need to implement and check for the feature flag

    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    66996a2 View commit details
    Browse the repository at this point in the history

  3. adding feature flag mumbo jumbo

    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    ab2c4ff View commit details
    Browse the repository at this point in the history

  4. updating feature flag configs, some enhancements, and commenting out … 

    …checkboxes to be implemented later
    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    35164b2 View commit details
    Browse the repository at this point in the history

  5. updated devlocal test to account for changes made

    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    010ab22 View commit details
    Browse the repository at this point in the history

  6. updating failing ui test

    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    55d071b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into MAIN-B-20793

    @danieljordan-caci
    danieljordan-caci authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    c4d3794 View commit details
    Browse the repository at this point in the history

  8. initial commit, everything should be working, tests added

    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    fa99b89 View commit details
    Browse the repository at this point in the history

  9. fixing some gross styling

    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    e27e0f5 View commit details
    Browse the repository at this point in the history

  10. sneaky spelling

    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    9fe06cc View commit details
    Browse the repository at this point in the history

  11. reflecting on Cameron's changes (get it???)

    @danieljordan-caci
    danieljordan-caci committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    14cdb5f View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge branch 'main' into MAIN-B-21029

    @danieljordan-caci
    danieljordan-caci authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    65f9807 View commit details
    Browse the repository at this point in the history

  2. initial commit, lemon squeezy

    @danieljordan-caci
    danieljordan-caci committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    5b98305 View commit details
    Browse the repository at this point in the history

  3. replaced estimated weight with customers entitlement from orders when… 

    … calculating estimated incentive of a PPM
    @danieljordan-caci
    danieljordan-caci committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    593d008 View commit details
    Browse the repository at this point in the history

  4. updated playwright after changed incentive calculation

    @danieljordan-caci
    danieljordan-caci committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    524e112 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into MAIN-B-20793

    @danieljordan-caci
    danieljordan-caci authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    3b31607 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #13667 from transcom/MAIN-B-21029 

    MAIN B-21029 rejected office users can resubmit
    @cameroncaci
    cameroncaci authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    82d57e4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into MAIN-B-20793

    @danieljordan-caci
    danieljordan-caci authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    651e80c View commit details
    Browse the repository at this point in the history

  8. Update RequestAccount.module.scss to solve merge conflict oopsie

    @danieljordan-caci
    danieljordan-caci authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    2397502 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into MAIN-B-20946

    @danieljordan-caci
    danieljordan-caci authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    7243c43 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into servicesTest

    @r-mettler
    r-mettler authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    d826473 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #13663 from transcom/MAIN-B-20793 

    MAIN B-20793 Add GSR role and base (QAE) traits in office/admin app
    @cameroncaci
    cameroncaci authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    c0a9fea View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into servicesTest

    @deandreJones
    deandreJones authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    55dadea View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into MAIN-B-20946

    @danieljordan-caci
    danieljordan-caci authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    92f6df2 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #13675 from transcom/MAIN-B-20946 

    MAIN B-20946 SSW max obligation calculation correction
    @deandreJones
    deandreJones authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    3657a7f View commit details
    Browse the repository at this point in the history

  15. Merge branch 'main' into servicesTest

    @r-mettler
    r-mettler authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    512e3a4 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #13664 from transcom/servicesTest 

    Services test
    @r-mettler
    r-mettler authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    980e638 View commit details
    Browse the repository at this point in the history

  17. 20654-new

    @deandreJones
    deandreJones committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ab5c661 View commit details
    Browse the repository at this point in the history

  18. Merge remote-tracking branch 'origin/B-20654-main' into B-20654-in

    @deandreJones
    deandreJones committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    7dfdf1e View commit details
    Browse the repository at this point in the history

  19. b-20654

    @deandreJones
    deandreJones committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    75cb86a View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. fix upload_test

    @deandreJones
    deandreJones committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    5d89136 View commit details
    Browse the repository at this point in the history