PulseUI

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

[PUL-7108] - added product_rownum to returns filter out dupes on $ totals

See merge request Pulse/PulseUI!171

[PUL-7108] - added product_rownum to returns filter out dupes on $ totals

Update version(s) - API: 2.0.10.1 | Web: 2.10.1

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

Merge branch 'feature/PUL-7074-change-pulse-training-to-best-practices-and-disable' into 'develop'

[PUL-7074] Renamed 'Pulse Training' to 'Best Practices' and disabled temporarily.

Closes PUL-7074

See merge request Pulse/PulseUI!170

[PUL-7074] Renamed 'Pulse Training' to 'Best Practices' and disabled temporarily.

Merge branch 'PUL_7108_ORANGE_BARS' into 'develop'

[PUL-7108] - added product_rownum to filter out dupes on $ totals

See merge request Pulse/PulseUI!168

[PUL-7108] - added product_rownum to filter out dupes on $ totals

Update version(s) - API: 2.0.10.0 | Web: 2.10.0

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

    • -0
    • +21
    /src/main/webapp/app/package-lock.json
Merge branch 'PUL-7100-display-categories-in-order-aco-dashboard' into 'develop'

[PUL-7100] ACO: Multi-category sessions: Dashboard page: Display order of the...

Closes PUL-7100

See merge request Pulse/PulseUI!161

    • -1
    • +10
    /src/main/webapp/app/src/apis/dashboardPageApi.js
Merge branch 'PUL-7089-ACO-review-sort-category' into 'develop'

[PUL-7089] ACO: Review page: Filter by product category list: Sort should be alphabetic

Closes PUL-7089

See merge request Pulse/PulseUI!166

Merge branch 'feature/PUL-7054-PUL-7074-user-training-and-release-notes' into 'develop'

Resolve PUL-7054 "Feature/ pul 7074 user training and release notes"

Closes PUL-7054

See merge request Pulse/PulseUI!167

[PUL-7089] ACO: Review page: Filter by product category list: Sort should be alphabetic

[PUL-7054] [PUL-7074] Removed old help code and references

    • -14
    • +0
    /src/main/webapp/app/src/_scss/pulse.scss
    • -6
    • +1
    /src/main/webapp/app/src/pulseAppConfig.js
  1. … 7 more files in changeset.
[PUL-7054] [PUL-7074] Replaced "User Help" dropdown with training and release notes links

Merge branch 'feature/PUL-7051-feedback-button' into 'develop'

Resolve PUL-7051 "Feature/ feedback button"

Closes PUL-7051

See merge request Pulse/PulseUI!165

[PUL-7051] Added feature flag

Merge branch 'PUL-7108_ORANGE_BARS' into 'develop'

Resolve PUL-7108 "Orange bars"

Closes PUL-7108

See merge request Pulse/PulseUI!164

[PUL-7108] remove nodeIds param -fix

Merge branch 'develop' into 'PUL-7108_ORANGE_BARS'

# Conflicts:

# src/main/webapp/app/src/apis/dashboardPageApi.js

Merge branch 'bug/PUL-7090_Debug_text' into 'develop'

[PUL-7090] - Removed DEBUG text from UI.

Closes PUL-7090

See merge request Pulse/PulseUI!163

[PUL-7051] Fixed overlay issue when flattening the image

[PUL-7108] remove nodeIds param

[PUL-7090] - Removed DEBUG text from UI.

PUL-7108 ACO Orange Bars amounts not aligned w/ ACO

Merge branch 'develop' into feature/PUL-7051-feedback-button

[PUL-7051] Load user feedback email distro from database

[PUL-7051] Translate user feedback placeholder text

[PUL-7100] ACO: Multi-category sessions: Dashboard page: remove log