Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

Lead time status.

    • -0
    • +1
    ./service/impl/LeadTimeServiceImpl.java
Dashboard Changes backend

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

bug fix

    • -2
    • +4
    ./security/GCPAuthenticationService.java
  1. … 1 more file in changeset.
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO-643

 Conflicts:

 pom.xml

bug fix

    • -20
    • +19
    ./entity/pulseui/MinMaxSitePref.java
    • -2
    • +1
    ./security/GCPAuthenticationService.java
    • -1
    • +1
    ./service/impl/LeadTimeServiceImpl.java
  1. … 1 more file in changeset.
Merge branch 'PO-643' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO_Test_643

# Conflicts:

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

Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO_Test_643

# Conflicts:

# pom.xml

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/develop'

    • -13
    • +269
    ./service/impl/ExportServiceImpl.java
test methods related to leadTime

  1. … 3 more files in changeset.
Merging Develop branch

    • -1
    • +1
    ./service/impl/AdHocRefreshServiceImpl.java
Merging Develop branch

    • -93
    • +634
    ./dao/impl/ReviewDAOImpl.java
    • -1
    • +1
    ./service/impl/AdHocRefreshServiceImpl.java
PO-643 -Lead_Time_status_Payload

    • -2
    • +10
    ./controller/rest/SessionRestController.java
    • -13
    • +1
    ./controller/rest/SiteRestController.java
    • -0
    • +21
    ./dto/LeadTimeStatusDTO.java
    • -2
    • +2
    ./service/impl/SessionServiceImpl.java
    • -1
    • +1
    ./service/interfaces/SessionService.java
PO-833 change

update session creation payload with new param

    • -2
    • +0
    ./controller/rest/SiteRestController.java
  1. … 1 more file in changeset.
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PO_Test_643

# Conflicts:

# src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java

# src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java

    • -733
    • +923
    ./dao/impl/HubSpokeNetworkDAOImpl.java
    • -1073
    • +2543
    ./dao/impl/ReviewDAOImpl.java
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/develop'

    • -13
    • +269
    ./service/impl/ExportServiceImpl.java
PO-643 -Lead_Time_status

    • -0
    • +28
    ./controller/rest/SiteRestController.java
    • -1
    • +2
    ./security/GCPAuthenticationService.java
  1. … 2 more files in changeset.
fix for 0to1 reviewpage advance filter

shub demand sales, dc sales, smarthubcount>0 changes

    • -115
    • +197
    ./dao/impl/ReviewDAOImpl.java
    • -185
    • +216
    ./service/impl/ExportServiceImpl.java