Commit Graph

70 Commits

Author SHA1 Message Date
kshitige
d5a09c8caa Conflicts resolved 2025-03-27 18:57:36 +05:30
kshitige
e6affd36e9 changes in delete and users 2025-03-27 18:54:06 +05:30
Shailesh-1981
f66719bd4a conflict solve 2025-03-27 18:43:42 +05:30
Shailesh-1981
b54c6dbfba api create 2025-03-27 17:20:57 +05:30
kshitige
b99fcf9c3b conflicts solved 2025-03-27 12:16:09 +05:30
Shailesh-1981
3f7084ef16 conflict solve 2025-03-27 12:08:43 +05:30
kshitige
50e37dc93d changes by sayali 2025-03-27 12:05:49 +05:30
sayaliparab
d5055fa42e telementary conflcit resloved 2025-03-27 11:47:53 +05:30
sayaliparab
e5f60bc0a8 sneha DOne 2025-03-27 11:43:12 +05:30
sayliraut
70ab842358 pass starTs and EndTs 2025-03-26 17:36:30 +05:30
Shailesh-1981
3f4fbb65c4 AlarmFetchConflicts 2025-03-26 17:20:32 +05:30
Shailesh-1981
b15beaf7d0 AlarmFetch 2025-03-26 17:14:34 +05:30
sayaliparab
03cc482fa3 noconflicts 2025-03-26 16:56:34 +05:30
sayliraut
5d1121d2f3 conflict solve 2025-03-26 16:54:51 +05:30
sayliraut
befe84d338 changes in route method 2025-03-26 16:53:02 +05:30
sayaliparab
a154167ba2 customerInfoNewChanges completed 2025-03-26 16:49:43 +05:30
sayaliparab
fee5bb4e8a conflicts solved routes 2025-03-26 12:21:22 +05:30
sayaliparab
f741450bec telemetry data device validation 2025-03-26 12:18:45 +05:30
sayliraut
c37eec7b19 conflict solve route method change for telementry data 2025-03-26 12:04:23 +05:30
sayliraut
0d7103ebbe device user list based on customer, login, create alarm 2025-03-26 11:37:58 +05:30
sayaliparab
6cdc2552c7 telemetry diagnostic and device 2025-03-26 11:21:24 +05:30
sayaliparab
42c4e1fc8b Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sayali 2025-03-25 12:21:43 +05:30
sayaliparab
93953de7d3 userAssetlink 2025-03-25 12:19:43 +05:30
sayliraut
6cfc5cd0dd conflict solve 2025-03-25 12:00:24 +05:30
sayliraut
c3a9682bfc append health_status and online 2025-03-25 11:40:43 +05:30
kshitige
af0ac06cc2 Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sneha 2025-03-25 11:36:10 +05:30
kshitige
cef3df82cf TelemetryData 2025-03-25 11:34:55 +05:30
sayaliparab
1be3c07328 chnages 2025-03-25 11:33:34 +05:30
sayaliparab
58b160e198 changes 2025-03-25 11:32:52 +05:30
kshitige
c0e4fab684 conflicts solved 2025-03-24 13:35:35 +05:30
kshitige
575d23884f UserAssetLinkLatest 2025-03-24 13:31:06 +05:30
sayliraut
ce9773f467 conflict solve 2025-03-21 19:26:17 +05:30
sayliraut
79f3059c7b device delete list 2025-03-21 19:24:02 +05:30
sayaliparab
53f0385c87 device master 2025-03-21 17:57:41 +05:30
sayaliparab
efae74769d device profile master 2025-03-21 12:16:21 +05:30
kshitige
c00c55f5e9 conflicts solved 2025-03-21 12:13:44 +05:30
kshitige
7153695218 customerdeviceInfo 2025-03-21 12:11:20 +05:30
sayaliparab
8e35f84b0c device Master 2025-03-21 12:11:18 +05:30
sayliraut
4bd8849b79 conflict 2025-03-20 12:59:45 +05:30
sayaliparab
253a0a26cb manage assest 2025-03-20 12:02:54 +05:30
sayliraut
491f3fcb2d conflicts solve 2025-03-20 12:02:37 +05:30
sayliraut
fb487ef0f0 device createorupdate 2025-03-20 12:01:01 +05:30
sayaliparab
bf03252013 assest 2025-03-20 11:52:34 +05:30
kshitige
2a2b6fb0b2 conflicts solved 2025-03-20 11:32:03 +05:30
kshitige
4c0b69f6f9 activation api and loginuser 2025-03-19 19:28:22 +05:30
sayliraut
b649b8e956 conflict solve 2025-03-19 15:33:18 +05:30
sayliraut
3dde8b41ce Customer Add Update List Delete 2025-03-19 15:17:54 +05:30
kshitige
1d6a4d4ebd User Create/List/Delete 2025-03-18 19:28:52 +05:30
kshitige
e121ac3a31 Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sneha 2025-03-18 16:40:02 +05:30
kshitige
6582cd39ed userService 2025-03-18 16:39:57 +05:30