Commit Graph

67 Commits

Author SHA1 Message Date
fa50427ae5 Merge pull request 'sneha' (#23) from sneha into main
Reviewed-on: Nikhil.Kadam/vib360#23
2025-03-21 06:44:50 +00:00
kshitige
c00c55f5e9 conflicts solved 2025-03-21 12:13:44 +05:30
kshitige
7153695218 customerdeviceInfo 2025-03-21 12:11:20 +05:30
eca7239c4e Merge pull request 'sayali' (#22) from sayali into main
Reviewed-on: Nikhil.Kadam/vib360#22
2025-03-20 06:43:01 +00:00
sayaliparab
503a921f1c assest route 2025-03-20 12:12:26 +05:30
sayaliparab
636713c638 assest route 2025-03-20 12:12:04 +05:30
dd895fb54e Merge pull request 'assest' (#21) from sayali into main
Reviewed-on: Nikhil.Kadam/vib360#21
2025-03-20 06:34:43 +00:00
sayaliparab
5418c69280 assest 2025-03-20 12:04:05 +05:30
0a8c995ea8 Merge pull request 'sayali' (#20) from sayali into main
Reviewed-on: Nikhil.Kadam/vib360#20
2025-03-20 06:33:35 +00:00
sayaliparab
253a0a26cb manage assest 2025-03-20 12:02:54 +05:30
sayaliparab
bf03252013 assest 2025-03-20 11:52:34 +05:30
7ed0317f3e Merge pull request 'sneha' (#19) from sneha into main
Reviewed-on: Nikhil.Kadam/vib360#19
2025-03-20 06:02:39 +00:00
kshitige
2a2b6fb0b2 conflicts solved 2025-03-20 11:32:03 +05:30
kshitige
ffb77b7da5 activation api and loginuser2 2025-03-20 11:30:25 +05:30
kshitige
4c0b69f6f9 activation api and loginuser 2025-03-19 19:28:22 +05:30
5fc1f3c899 Merge pull request 'sayliR' (#18) from sayliR into main
Reviewed-on: Nikhil.Kadam/vib360#18
2025-03-19 10:06:04 +00:00
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
d7b1aea9fc Merge pull request 'sneha' (#17) from sneha into main
Reviewed-on: Nikhil.Kadam/vib360#17
2025-03-18 13:59:46 +00:00
kshitige
3c431545ef Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sneha 2025-03-18 19:28:55 +05:30
kshitige
1d6a4d4ebd User Create/List/Delete 2025-03-18 19:28:52 +05:30
3a2500a95b Merge pull request 'sneha' (#16) from sneha into main
Reviewed-on: Nikhil.Kadam/vib360#16
2025-03-18 11:10:43 +00:00
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
b54c629fde Merge pull request 'sayali' (#15) from sayali into main
Reviewed-on: Nikhil.Kadam/vib360#15
2025-03-18 10:22:30 +00:00
sayaliparab
8824835a96 chnages 2025-03-18 15:51:44 +05:30
sayaliparab
94c26027c6 changes 2025-03-18 15:48:29 +05:30
665b884bd7 Merge pull request 'sneha' (#14) from sneha into main
Reviewed-on: Nikhil.Kadam/vib360#14
2025-03-18 10:16:56 +00:00
kshitige
2280abde46 Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sneha 2025-03-18 15:45:31 +05:30
kshitige
f584bd3255 Admin Token 2025-03-18 15:45:21 +05:30
79a3063ade Merge pull request 'sneha' (#13) from sneha into main
Reviewed-on: Nikhil.Kadam/vib360#13
2025-03-18 07:05:58 +00:00
kshitige
b20b13cb08 User asset new changes completed 2025-03-18 12:34:12 +05:30
kshitige
35f375f0e1 conflict solved 2025-03-18 12:29:47 +05:30
kshitige
86e93e561b new changes 2025-03-18 12:25:57 +05:30
73eafd7a55 Merge pull request 'sayali' (#12) from sayali into main
Reviewed-on: Nikhil.Kadam/vib360#12
2025-03-12 13:51:02 +00:00
sayaliparab
cc672bb2a7 Middleware 2025-03-12 19:20:15 +05:30
sayaliparab
40fdd22480 middleware_cors 2025-03-12 19:19:13 +05:30
18deca57e0 Merge pull request 'sayali' (#11) from sayali into main
Reviewed-on: Nikhil.Kadam/vib360#11
2025-03-11 14:48:35 +00:00
sayaliparab
b11b92d7c0 authMiddleware 2025-03-11 20:17:54 +05:30
sayaliparab
4d4846f474 middleware 2025-03-11 20:17:07 +05:30
d0ca6b8d97 Merge pull request 'sneha' (#10) from sneha into main
Reviewed-on: Nikhil.Kadam/vib360#10
2025-03-11 14:15:12 +00:00
kshitige
8942e0a36f UserAssetLinkNew 2025-03-11 19:44:37 +05:30
kshitige
b94656e219 Merge branch 'main' of http://git.wdipl.com/Nikhil.Kadam/vib360 into sneha 2025-03-11 19:22:00 +05:30
53b411b89a Merge pull request 'sayali' (#9) from sayali into main
Reviewed-on: Nikhil.Kadam/vib360#9
2025-03-11 13:51:44 +00:00
sayaliparab
aa37dc6813 login_customer 2025-03-11 19:21:00 +05:30
sayaliparab
8501f27c2d login 2025-03-11 19:20:18 +05:30
kshitige
7955109bf8 UserAssetLink 2025-03-11 19:05:25 +05:30
c4d591b97b Merge pull request 'sayali' (#8) from sayali into main
Reviewed-on: Nikhil.Kadam/vib360#8
2025-03-11 13:34:57 +00:00
sayaliparab
4e10e698cf helper 2025-03-11 19:04:08 +05:30
sayaliparab
42dd017430 helper 2025-03-11 19:03:30 +05:30