Clone
 

tspratt <tspratt@gmail.com> in PulseUI

[PUL-6223] Fixed issues with dialog sync and update button enable and Map selection highlighting

    • -4
    • +0
    /src/main/webapp/resources/css/pulse.scss
[PUL-6223] Final integration with export method, added loading icon for export

Merge branch 'develop' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into category_hub_spoke

[PUL-6223] Fixed problem intoduced byt previous fix

[PUL-6223] Fixed issue with synchronizing dialog and admin

[PUL-6223] Working Xfer Map/HubDef rename in dialog

Merge branch 'develop' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into category_hub_spoke

Merge branch 'develop' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into category_hub_spoke

[PUL-6223] Cleaning up the save dto, removing unnecessary properties.

merged a few changes from develop pulse.scss file

    • -0
    • +20
    /src/main/webapp/resources/css/pulse.scss
[PUL-6223] Added Functionality to invoke export Hub and spoke info. Also styling tweaks

    • -3
    • +14
    /src/main/webapp/resources/css/pulse.scss
    • -84323
    • +85058
    /src/main/webapp/resources/dist/app.bundle.js
    • -89
    • +89
    /src/main/webapp/resources/dist/appstyles.bundle.js
Working on mess with scss whitespace

    • -848
    • +0
    /src/main/webapp/resources/css/pulse.scss
Merge branch 'develop' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into category_hub_spoke

# Conflicts:

# src/main/webapp/resources/css/pulse.scss

# src/main/webapp/resources/dist/app.bundle.js

# src/main/webapp/resources/dist/app.bundle.js.map

# src/main/webapp/resources/dist/appstyles.bundle.js

# src/main/webapp/resources/dist/appstyles.bundle.js.map

Revert: [PUL-6300] Fixed whitespace issues with scss file THIS ADDED A BUNCH OF UNDESIRABLE BLANK LINES.

    • -902
    • +60
    /src/main/webapp/resources/css/pulse.scss
Merge branch 'develop' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into develop

# Conflicts:

# src/main/webapp/resources/css/pulse.scss

# src/main/webapp/resources/dist/appstyles.bundle.js

# src/main/webapp/resources/dist/appstyles.bundle.js.map

    • -0
    • +19
    /src/main/webapp/resources/css/pulse.scss
    • -318
    • +9295
    /src/main/webapp/resources/dist/app.bundle.js
[PUL-6300] Tweak to scss

    • -2
    • +1
    /src/main/webapp/resources/css/pulse.scss
[PUL-6300] Fixed whitespace issues with scss file

    • -60
    • +904
    /src/main/webapp/resources/css/pulse.scss
    • -51
    • +51
    /src/main/webapp/resources/dist/appstyles.bundle.js
[PUL-5790] DC / stock volume working correctly, Styling improved, save and revert verified

    • -5138
    • +6033
    /src/main/webapp/resources/css/pulse.scss
[PUL-5790] bundles

[PUL-5790] Enhancements to timing and synchronization issues, label fixes

Merge branch 'develop' of https://auapgpdgitapp01.genpt.net/Pulse/PulseUI into category_hub_spoke

# Conflicts:

# src/main/webapp/resources/css/pulse.scss

# src/main/webapp/resources/dist/app.bundle.js

# src/main/webapp/resources/dist/app.bundle.js.map

# src/main/webapp/resources/dist/appstyles.bundle.js

# src/main/webapp/resources/dist/appstyles.bundle.js.map

Also general fixes for translation issues

    • -27
    • +20
    /src/main/webapp/resources/css/pulse.scss
    • -440
    • +512
    /src/main/webapp/resources/dist/app.bundle.js
[PUL-6300] Pull from remote, bundles, and images

    • -0
    • +109097
    /src/main/webapp/resources/dist/app.bundle.js
    • -0
    • +511
    /src/main/webapp/resources/dist/appstyles.bundle.js
Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:

# src/main/webapp/resources/dist/app.bundle.js

# src/main/webapp/resources/dist/app.bundle.js.map

# src/main/webapp/resources/js/session/finalize/sessionFinalizeCompletedCtrl.js

[PUL-6300] General translation fixes, mis spellings, mismatched keys, missing keys.

[PUL-6314] Darkened odd row background color

[PUL-6300] Fixed some instances where translate received no key

[PUL-5790] Fixed cut/paste bug with spoke toggle

[PUL-5790] Working map ui and issues with refresh and service problems

    • -0
    • +1
    /src/main/webapp/resources/css/pulse.scss
Merge remote-tracking branch 'origin/category_hub_spoke' into category_hub_spoke

[PUL-5790] correcting problem with displaying spoke lise when there are not hubdefs yet

    • -359
    • +1016
    /src/main/webapp/resources/dist/app.bundle.js