PulseUI

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
[PUL-7290] Admin Console: Admin-Executive Tool for tracking outcomes: Review page MVP -- part 5

[PUL-7290] Admin Console: Admin-Executive Tool for tracking outcomes: Review page MVP -- part 4

    • -0
    • +38
    /src/main/webapp/app/src/apis/adminApi.js
Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into develop

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:

# src/main/java/com/napa/pulse/controller/rest/SiteRestController.java

Adding end point for inactive sites..the branch PUL-7166 had conflicts.

Merge branch 'PUL-7166' into 'develop'

Resolve PUL-7166

Closes PUL-7166

See merge request Pulse/PulseUI!238

Adding end point for inactive sites

Merge branch 'PUL-7166' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into PUL-7166

 Conflicts:

 src/main/java/com/napa/pulse/controller/rest/SiteRestController.java

Merge branch 'develop' into 'PUL-7166'

# Conflicts:

# src/main/java/com/napa/pulse/controller/rest/SiteRestController.java

Merge branch 'PUL-7166' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into PUL-7166

 Conflicts:

 src/main/java/com/napa/pulse/controller/rest/SiteRestController.java

[PUL-7166] : Made appropriate changes and removed not used code in that method

Merge branch 'PUL-7166' into 'develop'

Resolve PUL-7166

Closes PUL-7166

See merge request Pulse/PulseUI!236

Adding end point for inactive sites

Adding end point for inactive sites

Adding end point for inactive sites

[PUL-7290] Admin Console: Admin-Executive Tool for tracking outcomes: Review page MVP -- part 3

    • -2
    • +0
    /src/main/webapp/app/src/_scss/theme.scss
[PUL-7290] Admin Console: Admin-Executive Tool for tracking outcomes: Review page MVP -- part 2

    • -0
    • +24
    /src/main/webapp/app/package-lock.json
    • -1
    • +13
    /src/main/webapp/app/src/_scss/pulse.scss
    • -0
    • +49
    /src/main/webapp/app/src/reactComponents/SimpleDropdown.jsx
[PUL-7290] Admin Console: Admin-Executive Tool for tracking outcomes: Review page MVP

    • -0
    • +16
    /src/main/webapp/app/src/_scss/pulse.scss
    • -51
    • +71
    /src/main/webapp/app/src/_scss/theme.scss
    • -0
    • +117
    /src/main/webapp/app/src/_scss/whiteSass/_base.scss
    • -0
    • +8
    /src/main/webapp/app/src/_scss/whiteSass/_mixins.scss
    • -0
    • +200
    /src/main/webapp/app/src/_scss/whiteSass/_skin.scss
    • -0
    • +61
    /src/main/webapp/app/src/_scss/whiteSass/_typography.scss
    • -0
    • +109
    /src/main/webapp/app/src/_scss/whiteSass/_utils.scss
    • -0
    • +28
    /src/main/webapp/app/src/_scss/whiteSass/main.scss
  1. … 7 more files in changeset.
Merge branch 'PUL-7273-wizard-implementation-exploratory' into develop

Update pulsedb/tables/sku_edit_count.sql

    • -13
    • +23
    /pulsedb/tables/sku_edit_count.sql
Merge branch 'PUL-7287-1' into 'develop'

Updating changes for sku edit count

Closes PUL-7287

See merge request Pulse/PulseUI!234

Updating changes for sku edit count

Merge branch 'PUL-7287-1' into 'develop'

Updating changes for sku edit count

Closes PUL-7287

See merge request Pulse/PulseUI!233

Updating changes for sku edit count

Merge branch 'PUL-7287-1' into 'develop'

Resolve PUL-7287 "1"

Closes PUL-7287

See merge request Pulse/PulseUI!232

Updating changes for sku edit count

Merge branch 'PUL-7287-1' into 'develop'

Updating changes for sku edit count

See merge request Pulse/PulseUI!231

Updating changes for sku edit count

    • -0
    • +18
    /pulsedb/tables/sku_edit_count.sql
Updating changes for sku edit count

    • -0
    • +47
    /src/main/java/com/napa/pulse/dto/SkuReviewEditDTO.java
Merge branch 'PUL-7286-change-text-to-black' into 'develop'

[PUL-7286] View Session Preferences: change text to Black

Closes PUL-7286

See merge request Pulse/PulseUI!228