PulseUI

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
formatting the js

vendor filter all changes upto 26/7/2021

Resolve PUL-7729

    • -0
    • +5
    /src/main/webapp/app/src/_scss/pulse.scss
Merge branch 'PUL-7729' into 'develop'

Resolve PUL-7729

Closes PUL-7729

See merge request Pulse/PulseUI!454

PUL-7729-"Review Comments Addressed to Modify The changes"

    • -0
    • +5
    /src/main/webapp/app/src/_scss/pulse.scss
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7729

Merge branch 'PUL-7810' into 'develop'

Resolve PUL-7810

Closes PUL-7810

See merge request Pulse/PulseUI!453

Resolve PUL-7810

Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7810

feature - Hub Spoke: Product assignment limit to one hub

Merge branch 'PUL-7762' into 'develop'

PUL-7767 - Hub Spoke: Review Page: Site/SKU Details table display of HS parts

See merge request Pulse/PulseUI!452

PUL-7767 - Hub Spoke: Review Page: Site/SKU Details table display of HS parts

    • -0
    • +24
    /src/main/java/com/napa/pulse/dto/HubSpokeSitesDTO.java
Update version(s) - API: 2.0.90.0 | Web: 2.90.0

    • -1
    • +1
    /src/main/webapp/app/package-lock.json
Update version(s) - API: 2.0.89.0 | Web: 2.89.0

    • -1
    • +1
    /src/main/webapp/app/package-lock.json
Merge remote-tracking branch 'origin/develop'

Merge branch 'PUL-7780' into 'develop'

Removed the pulseui for Block Order Suggestion

Closes PUL-7780

See merge request Pulse/PulseUI!451

Removed the pulseui for Block Order Suggestion

Merge branch 'PUL-7762' into 'develop'

PUL-7762 - Slider page fix

See merge request Pulse/PulseUI!450

PUL-7762 - slider page fix

PUL-7762 - slider page fix for filter

Merge branch 'PUL-7762' into 'develop'

PUL-7762

See merge request Pulse/PulseUI!448

conflict resolved

Merge branch 'akash-temp' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7762

 Conflicts:

 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/interfaces/HubSpokeNetworkService.java

PUL-7762 - slider page changes

    • binary
    /src/main/webapp/app/resources/image/img/hubicon.png
    • -1
    • +50
    /src/main/webapp/app/src/_scss/parameter.scss
Merge branch 'PUL-7802' into 'develop'

UI & Service - Selected products should appear on Product Selection Page

Closes PUL-7802

See merge request Pulse/PulseUI!447

Integration of Vendor filter

Merge branch 'PUL-7802' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into tmp

 Conflicts:

 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/interfaces/HubSpokeNetworkService.java

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

 src/main/webapp/app/src/session/marketSelection/templates/siteProductSelectionDialog.html

commit1

    • -0
    • +14
    /src/main/java/com/napa/pulse/dto/ProductIdDTO.java
    • -0
    • +26
    /src/main/java/com/napa/pulse/dto/VendorDataDTO.java
UI & Service - Selected products should appear on Product Selection Page

Update version(s) - API: 2.0.88.0 | Web: 2.88.0

    • -1
    • +1
    /src/main/webapp/app/package-lock.json