Commit Graph

56 Commits

Author SHA1 Message Date
Nikhil Kadam
2735a92512 New fields in create device and update asset/device 2025-05-21 18:16:45 +05:30
Nikhil Kadam
6efe85b631 Changed flow in user create api 2025-05-18 13:46:32 +05:30
Nikhil Kadam
3a560f6aa7 Resolving issue in create user api flow 2025-05-16 22:40:12 +05:30
Nikhil Kadam
e9948e4430 Admin alarms 2025-05-14 16:00:50 +05:30
Nikhil Kadam
d0b4bcd930 Alarm api in progress 2025-05-13 17:11:47 +05:30
sayaliparab
615f6ba14d stateCIty 2025-04-08 16:24:43 +05:30
sayaliparab
36e3db0b95 country 2025-04-08 15:13:42 +05:30
sayaliparab
6a5d5f9303 country 2025-04-08 15:12:48 +05:30
kshitige
071dc60f16 get user by customer id new 2025-04-08 13:49:07 +05:30
kshitige
a68f69992b admin dashboard 2025-04-07 17:46:56 +05:30
kshitige
a4227ab7f5 changes 2025-04-07 11:43:37 +05:30
sayaliparab
1dcab02a3a alarm clear 2025-04-02 20:20:57 +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
8989d09c4f changes in user asset 2025-03-28 19:48:29 +05:30
sayliraut
e63295fb31 confict solve 2025-03-28 13:53:06 +05:30
sayaliparab
5fd60dec80 assest delete 2025-03-28 13:41:26 +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
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
Shailesh-1981
c4d43bbf42 pull from main 2025-03-27 12:03:40 +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
a55e24e28a filter alarm 2025-03-26 19:53:56 +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
sayliraut
befe84d338 changes in route method 2025-03-26 16:53:02 +05:30
sayliraut
0d7103ebbe device user list based on customer, login, create alarm 2025-03-26 11:37:58 +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
c0e4fab684 conflicts solved 2025-03-24 13:35:35 +05:30
kshitige
575d23884f UserAssetLinkLatest 2025-03-24 13:31:06 +05:30
sayliraut
6a75162f0c change in route method 2025-03-24 11:43:49 +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
8e35f84b0c device Master 2025-03-21 12:11:18 +05:30
sayliraut
4bd8849b79 conflict 2025-03-20 12:59:45 +05:30
sayaliparab
636713c638 assest route 2025-03-20 12:12:04 +05:30
sayaliparab
5418c69280 assest 2025-03-20 12:04:05 +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