PulseUI

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Review Filter 7768 local changes

Review Filter 7768 local changes

Merge branches 'PUL-7762' and 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7762

 Conflicts:

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

Review Filter 7768 local

Resolve PUL-7805

Merge branch 'PUL-7805' into 'develop'

Resolve PUL-7805

Closes PUL-7805

See merge request Pulse/PulseUI!468

Review Filter 7768 local changes

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

Fix- This error is because of 1000+ system hierarchies

Update version(s) - API: 2.0.96.0 | Web: 2.96.0

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

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

Merge branch 'PUL-7824' into 'develop'

PUL-7824 - Slider movement fix

See merge request Pulse/PulseUI!467

PUL-7824 - Slider movement fix

PUL-7762 - slider page changes

vendor filter

PUL-7823 - Slider movement fix

query change

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

PUL-7814_SystemActivationAddingReturnsToOrderOnlySessions

Vendor Filter loading icon and Remove Vendor Filter feature

PUL-7710 "Local Changes"

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

fixup! Vendor Filter loading icon removed

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

 Conflicts:

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

PUL-7798_Modify Create session stored procedure for hub spoke inclusion

PUL-7798_Modify Create session stored procedure for hub spoke inclusion

PUL-7769_BR_Recent_Stock_Rule

    • -19
    • +95
    /pulsedb/procedures/uap_sp_pulse_rules_isp_change.sql
    • -33
    • +64
    /pulsedb/procedures/us_sp_pulse_rules.sql
    • -19
    • +101
    /pulsedb/procedures/us_sp_pulse_rules_isp_change.sql
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into PUL-7710

 Conflicts:

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

Pul-7710 "Local Changes"

    • -13
    • +0
    /src/main/java/com/napa/pulse/dto/HubSiteData.java