PulseUI

Clone Tools
More
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 12 Mar 2021
2:03 pm

Yong Wang <yongwang.ai@gmail.com>

conflicts

Options
    • -4
    • +0
    /src/main/webapp/app/src/productComponent/productList.html
12:49 pm

Yong Wang <yong_wang@genpt.com>

Merge branch 'Revert-PUL-7505' into 'develop'

Fix for session-creation

Closes PUL-7505

See merge request Pulse/PulseUI!330

Options
11:19 am

Rahul Chaudhary

Fix for session-creation

Options
    • -8
    • +1
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
10:19 am

Ranjani Murali

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

This reverts merge request !328

Options
    • -8
    • +1
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
    • -2
    • +1
    /src/main/webapp/app/src/session/sessionPreferenceSettingService.js
8:52 am

Yong Wang <yong_wang@genpt.com>

Merge branch 'PUL-7505' into 'develop'

fix for includeSoldNotStocked & SalesPotential Column for SimParts edit

Closes PUL-7505

See merge request Pulse/PulseUI!328

Options
    • -1
    • +2
    /src/main/webapp/app/src/session/sessionPreferenceSettingService.js
8:51 am

Yong Wang <yong_wang@genpt.com>

Merge branch 'PUL-7540' into 'develop'

Sales History Sorting and All Sites Data Display

Closes PUL-7540

See merge request Pulse/PulseUI!329

Options
7:45 am

Ranjani Murali

Merge branch 'PUL-7503-SNS-inclusion-checked-session-preferences' into 'develop'

PUL-7503-sns-inclusion-checked-insession-referencepaeg

Closes PUL-7503

See merge request Pulse/PulseUI!320

Options
7:34 am

Rahul Chaudhary

Sales History Sorting and All Sites Data Display

Options
    • -2
    • +7
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -9
    • +5
    /src/main/webapp/app/src/session/mainLayout/templates/sessionMainLayoutView.html
    • -0
    • +5
    /src/main/webapp/app/src/session/sessionPreferenceSettingService.js
6:55 am

Rahul Chaudhary

fix for includeSoldNotStocked & SalesPotential Column for SimParts edit

Options
    • -1
    • +8
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
    • -1
    • +2
    /src/main/webapp/app/src/session/sessionPreferenceSettingService.js
Thursday 11 Mar 2021
12:47 pm

Yong Wang <yong_wang@genpt.com>

Merge branch 'PUL-7427' into 'develop'

UI Tooltip change

Closes PUL-7427

See merge request Pulse/PulseUI!324

Options
    • -3
    • +3
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
12:41 pm

Yong Wang <yong_wang@genpt.com>

Merge branch 'PUL-7403_ListSessions' into 'develop'

PUL-7403_ListSessions

Closes PUL-7403

See merge request Pulse/PulseUI!325

Options
    • -0
    • +13
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
12:38 pm

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-7537' into 'develop'

Fix for Sorting Min/Max Columns

Closes PUL-7537

See merge request Pulse/PulseUI!327

Options
12:34 pm

Yong Wang <yongwang.ai@gmail.com>

fix scrolling isssue on min/max

Options
    • -4
    • +5
    /src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js
12:32 pm

Rahul Chaudhary

Fix for Sorting Min/Max Columns

Options
    • -1
    • +1
    /src/main/java/com/napa/pulse/controller/rest/SessionRestController.java
    • -3
    • +33
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +3
    /src/main/java/com/napa/pulse/dao/interfaces/SessionDAO.java
    • -3
    • +3
    /src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java
    • -1
    • +3
    /src/main/java/com/napa/pulse/service/interfaces/SessionService.java
    • -1
    • +1
    /src/main/resources/application-us-dev.properties
10:31 am

raj_babu <raj_babu@genpt.com>

PUL-7403_ListSessions

Options
    • -0
    • +13
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -1
    • +10
    /src/main/java/com/napa/pulse/utils/ROLE.java
10:18 am

Yong Wang <yongwang.ai@gmail.com>

fix edit issue for min/max

Options
    • -1120
    • +1186
    /src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js
    • -137
    • +127
    /src/main/webapp/app/src/session/sessionPreferenceSettingService.js
9:38 am

Rahul Chaudhary

UI Tooltip change

Options
    • -3
    • +3
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -9
    • +21
    /src/main/webapp/app/src/session/mainLayout/templates/sessionMainLayoutView.html
    • -1
    • +10
    /src/main/webapp/app/src/session/preferences/sessionPreferenceCtrl.js
    • -0
    • +43
    /src/main/webapp/app/src/session/preferences/templates/preferenceView.html
9:29 am

raj_babu <raj_babu@genpt.com>

PUL-7533_UAP_Default_Sugg_Stocking_Qty_If_Null

Options
    • -1
    • +8
    /pulsedb/procedures/uap_create_new_sku_session.sql
Wednesday 10 Mar 2021
3:06 pm

Yong Wang <yong_wang@genpt.com>

Merge branch 'PUL-7534' into 'develop'

Min-Max Editable/First Stock Date Fix

Closes PUL-7534

See merge request Pulse/PulseUI!322

Options
3:01 pm

Raj Babu <raj_babu@genpt.com>

Merge branch 'PUL-7535' into 'develop'

Min-Max service changes

Closes PUL-7535

See merge request Pulse/PulseUI!321

Options
2:29 pm

Shoban Sriram

Merge branch 'PUL-7526_BlockOrder_SupplyChainOverride' into 'develop'

PUL-7526_BlockOrder_SupplyChainOverride

Closes PUL-7526

See merge request Pulse/PulseUI!323

Options
2:04 pm

raj_babu <raj_babu@genpt.com>

PUL-7526_BlockOrder_SupplyChainOverride

Options
    • -0
    • +14
    /pulsedb/procedures/us_sp_pulse_rules.sql
    • -0
    • +14
    /pulsedb/procedures/us_sp_pulse_rules_isp_change.sql
    • -0
    • +16
    /pulsedb/procedures/us_sp_pulse_rules_isp_global.sql
1:47 pm

Rahul Chaudhary

Min-Max Editable/FirstStockDate

Options
    • -0
    • +49
    /src/main/webapp/app/src/repositories/sessionDashboardRepo.js
    • -0
    • +64
    /src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js
    • -2
    • +13
    /src/main/webapp/app/src/session/sessionPreferenceSettingService.js
1:42 pm

Rahul Chaudhary

Min-Max service changes

Options
    • -0
    • +58
    /src/main/java/com/napa/pulse/controller/rest/SessionRestController.java
    • -2
    • +47
    /src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
    • -0
    • +15
    /src/main/java/com/napa/pulse/dao/interfaces/SessionDAO.java
    • -0
    • +13
    /src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java
    • -0
    • +15
    /src/main/java/com/napa/pulse/service/interfaces/SessionService.java
Tuesday 09 Mar 2021
10:19 pm

Shoban Sriram

Merge branch 'PUL-7530_SpecialsInSessions' into 'develop'

PUL-7530_SpecialsInSessions

Closes PUL-7530

See merge request Pulse/PulseUI!319

Options
4:51 pm

Yong Wang <yongwang.ai@gmail.com>

PUL-7503-sns-inclusion-checked-insession-referencepaeg

Options
    • -91
    • +109
    /src/main/webapp/app/src/session/preferences/templates/preferenceReview.html
Monday 08 Mar 2021
3:09 pm

Jenkins <noreply@jenkins>

Update version(s) - API: 2.0.55.0 | Web: 2.55.0

Options
    • -1
    • +1
    /pom.xml
    • -1
    • +1
    /src/main/webapp/app/package-lock.json
    • -1
    • +1
    /src/main/webapp/app/package.json
3:06 pm

Jenkins <noreply@jenkins>

Update version(s) - API: 2.0.54.0 | Web: 2.54.0

Options
    • -1
    • +1
    /pom.xml
    • -1
    • +1
    /src/main/webapp/app/package-lock.json
    • -1
    • +1
    /src/main/webapp/app/package.json
3:03 pm

Jenkins <noreply@jenkins>

Merge remote-tracking branch 'origin/develop'

Options
2:05 pm

Yong Wang <yongwang.ai@gmail.com>

fix cogwheel missing issue -part 2

Options
    • -2
    • +2
    /src/main/webapp/app/src/session/dashboard/templates/sessionDashboardView.html