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

PUL-8334: First Stock Date on the Adv Filter UI Changes

    • -99
    • +107
    /src/main/webapp/app/src/apis/reviewPageApi.js
Merge branch 'PUL-8259_conflict_resolved' into 'develop'

Resolve PUL-8259 "Conflict resolved"

Closes PUL-8259

See merge request Pulse/PulseUI!745

Change for PUL-8282 Dated 26.07.2022 BY Aqueel

PUL-8287 - UI fix from demand threshold

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

 Conflicts:

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

alignment fix

Merge branch 'Test-PUL-8259_Epic_formatted_ui' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-8259_conflict_resolved

 Conflicts:

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

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

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

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

formatting done using prettier config

formatting done using prettier config

Merge branch 'PUL-8268' into 'develop'

Resolve PUL-8268

Closes PUL-8268

See merge request Pulse/PulseUI!731

PUL-8321: SQL Error in ReviewServiceImpl ->getSkuTableDataCount method

    • -110
    • +102
    /src/main/webapp/app/src/apis/reviewPageApi.js
PUL-8283: 26-08-22 By Eshani 04:15 PM Dollar Limit Session error

Change in Test Case Dated 26.08.2022 BY Aqueel

Merge branch 'PUL-8268' into 'test_develop'

Resolve PUL-8268

See merge request Pulse/PulseUI!744

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

Update version(s) - API: 2.0.204.0 | Web: 2.204.0

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

Revert "Merge branch 'PUL-8329' into 'develop'"

This reverts merge request !742

Revert "Merge branch 'PUL-8329' into 'Anil-Special'"

This reverts merge request !743

    • -23
    • +22
    /pulsedb/procedures/add_similar_parts.sql
    • -2
    • +2
    /pulsedb/procedures/calculate_min_max.sql
    • -13
    • +0
    /pulsedb/procedures/us_sp_pulse_rules.sql
    • -155
    • +0
    /pulsedb/scripts/new_numbers_cycle3.sql
  1. … 6 more files in changeset.
Merge branch 'PUL-8329' into 'Anil-Special'

Resolve PUL-8329

See merge request Pulse/PulseUI!743

Merge branch 'Anil-Special' into 'PUL-8329'

# Conflicts:

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

# src/main/webapp/app/src/session/marketSelection/templates/newHubSpokeView.html

Merge branch 'PUL-8329' into 'develop'

Adding loggers in createNewSession()

Closes PUL-8329

See merge request Pulse/PulseUI!742

Adding loggers in createNewSession()

Merge branch 'PUL-8314' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-8022

Merge branch 'PUL-8314' into 'Integration_test_PUL-8314_PUL-8315'

Update showSpokeExcelDropdown flag with hs_part

See merge request Pulse/PulseUI!741

Update showSpokeExcelDropdown flag with hs_part

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

Merge branch 'PUL-8289' into 'develop'

Resolve PUL-8289

Closes PUL-8289

See merge request Pulse/PulseUI!740