PulseUI

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 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
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

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

Merge branch 'PUL-7780' into 'develop'

BOS- Adding stored procedure

Closes PUL-7780

See merge request Pulse/PulseUI!445

BOS- Adding stored procedure

PUL-7797_SystemsRemovingOverstocks

PUL-7780_BlockOrderSuggestion

    • -58
    • +103
    /pulsedb/procedures/us_sp_pulse_rules.sql
Merge branch 'PUL-7785' into 'develop'

UI Changes for Auto Focus Order/Keep Field not working

Closes PUL-7785

See merge request Pulse/PulseUI!444

UI Changes for Auto Focus Order/Keep Field not working

PUL-7762 - slider page

    • -0
    • +40
    /src/main/java/com/napa/pulse/dto/DemandthresholdDTO.java
PUL-7762 - slider page

    • -0
    • +43
    /src/main/java/com/napa/pulse/dto/HubSliderDto.java
PUL-7762 - slider page

Merge branch 'PUL-7729' into 'develop'

PUL-7729 - Session Creation: Inclusions: Orders and Returns: UI and Service

Closes PUL-7729

See merge request Pulse/PulseUI!443

PUL-7729 - Session Creation: Inclusions: Orders and Returns: UI and Service

    • binary
    /src/main/webapp/app/resources/image/img/hubspoke.png
Merge branch 'PUL-7780' into 'develop'

Adding update query for site_product table for block_order_suggestion change.

Closes PUL-7780

See merge request Pulse/PulseUI!442

Adding update query for site_product table for block_order_suggestion change.

Merge branch 'PUL-7780' into 'develop'

fix - block_order_suggestion

Closes PUL-7780

See merge request Pulse/PulseUI!441

fix - block_order_suggestion