Commit Graph

118 Commits

Author SHA1 Message Date
sayliraut
c6a0f618fa Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sayliR 2025-04-09 18:00:31 +05:30
sayliraut
e68991d0ff changes in table 2025-04-09 17:59:56 +05:30
kshitige
071dc60f16 get user by customer id new 2025-04-08 13:49:07 +05:30
kshitige
c22801f35b Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sneha 2025-04-08 13:40:18 +05:30
kshitige
fbb02214ce get asset by id and device by id changes completed 2025-04-08 13:40:11 +05:30
sayliraut
cfcf3a5972 conflict solve 2025-04-08 13:37:42 +05:30
sayliraut
25ffa94654 alert message in user asset API 2025-04-08 13:18:08 +05:30
sayaliparab
ef2269eb15 userAssest 2025-04-08 13:15:21 +05:30
sayaliparab
97141bd579 UserAssest 2025-04-08 13:08:54 +05:30
kshitige
2f9f38aeb5 Changes in asset and device list 2025-04-08 12:52:01 +05:30
kshitige
31a4c5f3fd Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sneha 2025-04-07 17:47:12 +05:30
kshitige
a68f69992b admin dashboard 2025-04-07 17:46:56 +05:30
sayliraut
8e07523e97 conflict solve 2025-04-07 12:55:47 +05:30
sayliraut
1d5f3af7c3 changes in user asset API 2025-04-07 12:53:20 +05:30
kshitige
9e67e51f72 changes in telemetry asset 2025-04-07 12:10:14 +05:30
kshitige
a4227ab7f5 changes 2025-04-07 11:43:37 +05:30
kshitige
ec782484f9 Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sneha 2025-04-04 13:29:59 +05:30
kshitige
8d83eacf09 alert message in get method 2025-04-04 13:29:54 +05:30
sayaliparab
b636e07711 celebration_ICON MEssage 2025-04-04 12:58:41 +05:30
sayaliparab
9529a0af57 alarm 2025-04-02 20:21:39 +05:30
sayaliparab
1dcab02a3a alarm clear 2025-04-02 20:20:57 +05:30
kshitige
1f8c01e035 telemetry data asset 2025-04-02 19:45:39 +05:30
sayaliparab
6515fad1c5 pressure_value 2025-04-01 20:07:20 +05:30
sayaliparab
eab75caed5 pressure_value 2025-04-01 20:06:28 +05:30
sayliraut
534b6006e0 change 2025-04-01 19:43:47 +05:30
sayliraut
4840c38979 color code 2025-04-01 19:42:42 +05:30
kshitige
0c9fa8b060 alarm device completed 2025-04-01 19:35:49 +05:30
sayliraut
6686bf701e timeseries table 2025-04-01 16:58:21 +05:30
sayliraut
edc646a457 conflict solve 2025-04-01 16:57:19 +05:30
kshitige
668e06215c conflicts solved 2025-04-01 16:54:58 +05:30
kshitige
3cecc401f9 alert message 2025-04-01 16:53:04 +05:30
sayliraut
c6e714ef4e changes in telemntry data asset api 2025-04-01 15:37:41 +05:30
sayaliparab
be008a5ea9 alarmAlert 2025-04-01 12:31:47 +05:30
sayaliparab
6f5131f5b9 alarmAlert 2025-04-01 12:14:03 +05:30
kshitige
6ab3537867 conflicts solved 2025-03-31 19:20:41 +05:30
kshitige
e01728c38d changes in alarm changes in telemetry data device 2025-03-31 19:18:36 +05:30
sayliraut
955cdb7081 customer-device-info modify 2025-03-31 15:18:32 +05:30
sayliraut
32a33dbd87 customer-device-info modify 2025-03-31 15:15:12 +05:30
sayaliparab
78e78297a7 rule chain 2025-03-28 20:02:33 +05:30
sayaliparab
fbaced66ae rulechain 2025-03-28 20:01:51 +05:30
sayliraut
d6b4a79d8a changes in user asset 2025-03-28 19:49:22 +05:30
sayliraut
8989d09c4f changes in user asset 2025-03-28 19:48:29 +05:30
kshitige
2bcfaa1eca no conflicts 2025-03-28 19:42:25 +05:30
kshitige
2051212afa CustomerInfoalertCount 2025-03-28 19:40:39 +05:30
sayaliparab
cddbb815d1 assestDelete 2025-03-28 13:54:50 +05:30
sayaliparab
abdc55ebf8 deleteAssest 2025-03-28 13:54:21 +05:30
sayliraut
fbf31e976c conflict solve 2025-03-28 13:52:02 +05:30
sayliraut
3dbef32bbe modify code 2025-03-28 13:35:40 +05:30
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