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 20473 int #13957

Merged
merged 63 commits into from
Oct 24, 2024
Merged

B 20473 int #13957

merged 63 commits into from
Oct 24, 2024

Commits on Oct 1, 2024

  1. cancel move for SC and TOO

    @pambecker
    pambecker committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    4ec32e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. updates to button and modal

    @pambecker
    pambecker committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    249bdb7 View commit details
    Browse the repository at this point in the history

  2. connect cancel to backend call

    @pambecker
    pambecker committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    31fcb59 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. cleanup

    @pambecker
    pambecker committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    903e2ae View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. fix issue with PPM only not canceling

    @pambecker
    pambecker committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    65d6e3c View commit details
    Browse the repository at this point in the history

  2. Fix MTO Canceled label for PPM

    @pambecker
    pambecker committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    29804ed View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. button placement

    @pambecker
    pambecker committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    bf5634f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9fc955c View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. update tests

    @pambecker
    pambecker committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    5710bc5 View commit details
    Browse the repository at this point in the history

  2. updates to refresh page

    @pambecker
    pambecker committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    abca4eb View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. update shipment labels on cards

    @pambecker
    pambecker committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    dc08742 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d305f72 View commit details
    Browse the repository at this point in the history

  3. update

    @pambecker
    pambecker committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    6dd1149 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    71165cd View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. address is_oconus implementation

    @TevinAdams
    TevinAdams committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    aaaf0ff View commit details
    Browse the repository at this point in the history

  2. update with main

    @TevinAdams
    TevinAdams committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4f68d5b View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge remote-tracking branch 'origin/B-21077-Move-Shipment-Button-MAI… 

    …N' into B-20473-Office-user-cancel-move
    @pambecker
    pambecker committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    81e6332 View commit details
    Browse the repository at this point in the history

  2. button alignment, css changes

    @pambecker
    pambecker committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    b65c621 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Merge branch 'B-21077-Move-Shipment-Button-MAIN' into B-20473-Office-… 

    …user-cancel-move
    @pambecker
    pambecker committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    82ba4ea View commit details
    Browse the repository at this point in the history

  2. Merge branch 'B-21077-Move-Shipment-Button-MAIN' into B-20473-Office-… 

    …user-cancel-move
    @pambecker
    pambecker committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    8798f41 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'B-20473-Office-user-cancel-move' into B-20473-INT

    @pambecker
    pambecker committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    20fa246 View commit details
    Browse the repository at this point in the history

  4. spelling updates, happo changes

    @pambecker
    pambecker committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    7e5ab75 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'B-20473-Office-user-cancel-move' into B-20473-INT

    @pambecker
    pambecker committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    beebc64 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    3bcb558 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    4670835 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    e466457 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    dca783f View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    850a530 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'B-20473-Office-user-cancel-move' into B-20473-INT

    @pambecker
    pambecker committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    41780d4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    0e8c62f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    4349c30 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    d4382f7 View commit details
    Browse the repository at this point in the history

  6. changes per peer review, not needed code

    @pambecker
    pambecker committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    63e0a67 View commit details
    Browse the repository at this point in the history

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

    @traskowskycaci
    traskowskycaci committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    440bffa View commit details
    Browse the repository at this point in the history

  8. Merge branch 'B-20473-Office-user-cancel-move' into B-20473-INT

    @pambecker
    pambecker committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    fcc3012 View commit details
    Browse the repository at this point in the history

  9. fix merge conflict

    @pambecker
    pambecker committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    4feb66d View commit details
    Browse the repository at this point in the history

  10. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c4d8494 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into B-21363-MAIN

    @traskowskycaci
    traskowskycaci committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    ec00a7f View commit details
    Browse the repository at this point in the history

  12. Merge branch 'B-21363-MAIN' into B-21362-MAIN

    @traskowskycaci
    traskowskycaci committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    1fdd432 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    cda7294 View commit details
    Browse the repository at this point in the history

  2. adding tests

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    a752a61 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    54dba27 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'B-20473-Office-user-cancel-move' into B-20473-INT

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    a22e862 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    eac5df5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into B-21427-Update-addresses-is-oconus

    @TevinAdams
    TevinAdams committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d0f8216 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    0b0a376 View commit details
    Browse the repository at this point in the history

  8. Adding the rest of the changes from int PR

    @TevinAdams
    TevinAdams committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    cdaa231 View commit details
    Browse the repository at this point in the history

  9. Remove change thats not in int PR

    @TevinAdams
    TevinAdams committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    0d1ae65 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into B-21362-MAIN

    @traskowskycaci
    traskowskycaci committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    248a1dc View commit details
    Browse the repository at this point in the history

  11. Missed this test addition

    @TevinAdams
    TevinAdams committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    be70c0b View commit details
    Browse the repository at this point in the history

  12. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    2a60d60 View commit details
    Browse the repository at this point in the history

  13. fix merge conflict

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    3d8884a View commit details
    Browse the repository at this point in the history

  14. more tests

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    c3f1059 View commit details
    Browse the repository at this point in the history

  15. increasing statement timeout

    @TevinAdams
    TevinAdams committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    1cb9982 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #13984 from transcom/B-21427-Update-addresses-is-o… 

    …conus

B 21427 update addresses is oconus
    @cameroncaci
    cameroncaci authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    794a7ea View commit details
    Browse the repository at this point in the history

  17. Merge branch 'main' into B-21362-MAIN

    @traskowskycaci
    traskowskycaci committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d900991 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #13985 from transcom/B-21362-MAIN 

    B-21362/B-21363 UB Shipment Updates - MAIN
    @deandreJones
    deandreJones authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    21cd8c8 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'main' into B-20473-Office-user-cancel-move

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    f39352c View commit details
    Browse the repository at this point in the history

  20. Merge branch 'B-20473-Office-user-cancel-move' into B-20473-INT

    @pambecker
    pambecker committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    5dd7ce1 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. test case

    @pambecker
    pambecker committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    2167646 View commit details
    Browse the repository at this point in the history

  2. undoing changes that I thought help test case issues to pass

    @pambecker
    pambecker committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    67ef509 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    907df90 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'integrationTesting' into B-20473-INT

    @pambecker
    pambecker committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    53b02e3 View commit details
    Browse the repository at this point in the history