Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO-864

 Conflicts:

 src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java

    • -193
    • +132
    ./dao/impl/SessionDAOImpl.java
PO-866 change 14 june 24

Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO-864

finalize query change updated

finalize query change updated

PO-866 change 12 june 24

    • -0
    • +11
    ./entity/pulseui/FailedTransmission.java
condition finilize

condition finilize

change payload request api

    • -2
    • +2
    ./controller/rest/SessionRestController.java
  1. … 1 more file in changeset.
change payload request api

    • -2
    • +2
    ./controller/rest/SessionRestController.java
  1. … 1 more file in changeset.
PO_864_service

    • -1
    • +2
    ./controller/rest/SessionRestController.java
    • -2
    • +2
    ./service/impl/SessionServiceImpl.java
    • -1
    • +2
    ./service/interfaces/SessionService.java
PO_864_service

    • -1
    • +2
    ./controller/rest/SessionRestController.java
    • -2
    • +2
    ./service/impl/SessionServiceImpl.java
    • -1
    • +2
    ./service/interfaces/SessionService.java
leadtime filter bug fix

Merge remote-tracking branch 'origin/develop'

    • -13
    • +269
    ./service/impl/ExportServiceImpl.java
leadtime chnages

properties changes

    • -1
    • +1
    ./security/GCPAuthenticationService.java
  1. … 2 more files in changeset.
exisiting test class created issue fixed it

    • -1
    • +4
    ./service/impl/TrainingResourceServiceImpl.java
  1. … 1 more file in changeset.
testcase issue

    • -3
    • +2
    ./controller/rest/TrainingResourceController.java
    • -9
    • +3
    ./service/impl/TrainingResourceServiceImpl.java
Merge branch 'PO-643' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO-643

Lead time logger

    • -4
    • +4
    ./controller/rest/SessionRestController.java
merge conflicts

  1. … 3 more files in changeset.
error in review changes

    • -14
    • +0
    ./controller/rest/ReviewRestControllerTest.java
  1. … 1 more file in changeset.
changes are committed

    • -1
    • +1
    ./controller/rest/ProductGroupRestController.java
    • -2
    • +2
    ./service/impl/LeadTimeServiceImpl.java
unit testcases are added

  1. … 1 more file in changeset.
Lead time status preferences

  1. … 2 more files in changeset.
Lead time status.

    • -11
    • +11
    ./controller/rest/SessionRestController.java
    • -4
    • +4
    ./service/impl/SessionServiceImpl.java
    • -1
    • +1
    ./service/interfaces/SessionService.java
Merge branch 'PO-643' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO_Test_643

# Conflicts:

# pom.xml

  1. … 1 more file in changeset.
Lead time status.

Lead time status.

    • -11
    • +11
    ./controller/rest/SessionRestController.java
    • -3
    • +12
    ./service/impl/LeadTimeServiceImpl.java
    • -4
    • +4
    ./service/impl/SessionServiceImpl.java
    • -1
    • +1
    ./service/interfaces/SessionService.java
Lead time status.