PulseUI

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'PO-68' into 'develop'

Resolve PO-68

Closes PO-68

See merge request Pulse/PulseUI!911

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

Merge branch 'PO-53' into 'develop'

Resolve PO-53

Closes PO-53

See merge request Pulse/PulseUI!910

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

PO-68 my local local

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

 Conflicts:

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

 src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java

PO-68 my local local

remove duplicate site issue on same network

Merge branch 'PO-49' into 'develop'

PO-49

See merge request Pulse/PulseUI!909

if condiiton is modified for checking the undefined

if condiiton is added for checking the undefined

bulkedit changes

Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into po-44

 Conflicts:

 pom.xml

 src/main/java/com/napa/pulse/controller/rest/HubSpokeNetworkController.java

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

 src/main/java/com/napa/pulse/dao/interfaces/HubSpokeNetworkDAO.java

 src/main/java/com/napa/pulse/service/impl/HubSpokeNetworkServiceImpl.java

 src/main/java/com/napa/pulse/service/interfaces/HubSpokeNetworkService.java

 src/main/webapp/app/package-lock.json

 src/main/webapp/app/package.json

 src/main/webapp/app/src/repositories/hubSpokeRepo.js

 src/main/webapp/app/src/session/marketSelection/hubSpokeAdminCtrl.js

Merge remote-tracking branch 'origin/develop'

Update version(s) - API: 2.0.262.18 | Web: 2.262.18

    • -1
    • +1
    /src/main/webapp/app/package-lock.json
Reverted QA DB to old 12C

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

update bulk edit payload

update site product id payload

udpate siteproductid payload as per backend parameter

removed unused comment fun

add siteid with product id in bulk edit api

PO-45-New "NAN Issue Resolved "

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

 Conflicts:

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

bulkedit changes payload change in count

Update version(s) - API: 2.0.262.17 | Web: 2.262.17

    • -1
    • +1
    /src/main/webapp/app/package-lock.json
Merge branch 'PO-45-revert' into 'develop'

revert PO-45 changes reverted

Closes PO-45

See merge request Pulse/PulseUI!908

revert PO-45 changes reverted

PO-45-New "NAN Issue Resolved "

Merge branch 'PO-45-New' into 'develop'

PO-45-New "NAN Issue Resolved

Closes PO-45

See merge request Pulse/PulseUI!906