Skip to content

Actions: ohcnetwork/care_fe

Actions

Auto Label Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label-merge-conflict.yml
275 workflow run results
275 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Added AMC Warranty filters and expiry labels for assets Auto Label Conflicts #5353: Pull request #6364 synchronize by nihal467
October 9, 2023 08:24 2m 22s GokulramGHV:fix-issue-6241
GokulramGHV:fix-issue-6241
October 9, 2023 08:24 2m 22s
fix cypress (#6421) Auto Label Conflicts #5352: Commit e64138c pushed by khavinshankar
October 9, 2023 08:23 30s develop
develop
October 9, 2023 08:23 30s
Added Preview Page UI, migrated to SlideOver Component & icons updated. Auto Label Conflicts #5351: Pull request #6296 synchronize by nihal467
October 9, 2023 08:17 31s yogeshbhutkar:featureBranch-4
yogeshbhutkar:featureBranch-4
October 9, 2023 08:17 31s
Fix Cypress Failure in Assets Auto Label Conflicts #5350: Pull request #6421 opened by nihal467
October 9, 2023 08:14 29s fix-cypress
fix-cypress
October 9, 2023 08:14 29s
Group medicine administration by 4 hours + Support for archiving medicines + Administration Activity View + migrate useDispatch to useQuery Auto Label Conflicts #5349: Pull request #6396 synchronize by rithviknishad
October 9, 2023 06:57 31s mar-binning
mar-binning
October 9, 2023 06:57 31s
Replaced useDispatch with useQuery and request in ExternalResult (src/Components/ExternalResult/** ) Auto Label Conflicts #5347: Pull request #6402 synchronize by konavivekramakrishna
October 8, 2023 15:42 27s konavivekramakrishna:fix#6360
konavivekramakrishna:fix#6360
October 8, 2023 15:42 27s
Replaced useDispatch with useQuery and request in ExternalResult (src/Components/ExternalResult/** ) Auto Label Conflicts #5348: Pull request #6402 reopened by konavivekramakrishna
October 8, 2023 15:42 5m 51s konavivekramakrishna:fix#6360
konavivekramakrishna:fix#6360
October 8, 2023 15:42 5m 51s
whitelisted jwt_token_refresh_interval Auto Label Conflicts #5346: Pull request #6418 synchronize by kshitijv256
October 8, 2023 12:14 27s kshitijv256:jwt_token
kshitijv256:jwt_token
October 8, 2023 12:14 27s
whitelisted jwt_token_refresh_interval Auto Label Conflicts #5345: Pull request #6418 opened by kshitijv256
October 8, 2023 12:13 30s kshitijv256:jwt_token
kshitijv256:jwt_token
October 8, 2023 12:13 30s
Replaced dispatch with useQuery and request in Asset module Auto Label Conflicts #5344: Pull request #6374 synchronize by kshitijv256
October 8, 2023 08:24 28s kshitijv256:asset_changes
kshitijv256:asset_changes
October 8, 2023 08:24 28s
Aligned Service History & Transaction History in Asset Details Auto Label Conflicts #5343: Pull request #6382 synchronize by nihal467
October 8, 2023 07:43 6m 2s GokulramGHV:fix-issue-6362
GokulramGHV:fix-issue-6362
October 8, 2023 07:43 6m 2s
Track camera feed views and display offline status Auto Label Conflicts #5342: Pull request #6408 synchronize by nihal467
October 8, 2023 07:42 28s camera-feed-offline-status
camera-feed-offline-status
October 8, 2023 07:42 28s
Optimize lodash. Fixes #6006 Auto Label Conflicts #5341: Pull request #6415 synchronize by nihal467
October 8, 2023 07:41 27s Omkar76:optimize-lodash-es
Omkar76:optimize-lodash-es
October 8, 2023 07:41 27s
change all useDispatch to useQuery and request hooks in Consultations (src/Components/Facility/Consultations/**) Auto Label Conflicts #5340: Pull request #6416 synchronize by AshrafMd-1
October 7, 2023 19:24 27s AshrafMd-1:Fix#6372
AshrafMd-1:Fix#6372
October 7, 2023 19:24 27s
Replaced date-fns utility functions from DateInputV2 component with day.js Auto Label Conflicts #5338: Pull request #6405 synchronize by thedevildude
October 7, 2023 15:28 5m 11s issue#6305
issue#6305
October 7, 2023 15:28 5m 11s
Optimize lodash. Fixes #6006 Auto Label Conflicts #5337: Pull request #6415 opened by Omkar76
October 7, 2023 07:41 27s Omkar76:optimize-lodash-es
Omkar76:optimize-lodash-es
October 7, 2023 07:41 27s
cypress fix: select non group ICD11 entity; fixes #6411 (#6412) Auto Label Conflicts #5336: Commit 83597f1 pushed by khavinshankar
October 6, 2023 15:48 32s develop
develop
October 6, 2023 15:48 32s
Fix date range end picker (#6413) Auto Label Conflicts #5335: Commit 6558eb7 pushed by khavinshankar
October 6, 2023 15:48 31s develop
develop
October 6, 2023 15:48 31s
Added AMC Warranty filters and expiry labels for assets Auto Label Conflicts #5334: Pull request #6364 synchronize by GokulramGHV
October 6, 2023 14:39 27s GokulramGHV:fix-issue-6241
GokulramGHV:fix-issue-6241
October 6, 2023 14:39 27s
Added AMC Warranty filters and expiry labels for assets Auto Label Conflicts #5333: Pull request #6364 synchronize by GokulramGHV
October 6, 2023 14:30 27s GokulramGHV:fix-issue-6241
GokulramGHV:fix-issue-6241
October 6, 2023 14:30 27s
Aligned Service History & Transaction History in Asset Details Auto Label Conflicts #5332: Pull request #6382 synchronize by GokulramGHV
October 6, 2023 14:05 27s GokulramGHV:fix-issue-6362
GokulramGHV:fix-issue-6362
October 6, 2023 14:05 27s
Aligned Service History & Transaction History in Asset Details Auto Label Conflicts #5331: Pull request #6382 synchronize by GokulramGHV
October 6, 2023 14:04 35s GokulramGHV:fix-issue-6362
GokulramGHV:fix-issue-6362
October 6, 2023 14:04 35s
Fix date range end picker Auto Label Conflicts #5330: Pull request #6413 opened by Ashesh3
October 6, 2023 12:34 29s fix-date-inp
fix-date-inp
October 6, 2023 12:34 29s
cypress fix: select non group ICD11 entity Auto Label Conflicts #5329: Pull request #6412 opened by rithviknishad
October 6, 2023 12:23 28s rithviknishad-patch-1
rithviknishad-patch-1
October 6, 2023 12:23 28s
Vitals Monitor: Shows relative time for blood pressure and hide if st… Auto Label Conflicts #5328: Commit 9d26e02 pushed by khavinshankar
October 6, 2023 12:10 35s develop
develop
October 6, 2023 12:10 35s