 ashok
|
c6bd4964d0
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
 Bhaskar
|
05677318db
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
c4e864201a
|
manual mesaure calculation
|
8 months ago |
|
ashok
|
e939159329
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
 Varun
|
8838b64a92
|
changes
|
8 months ago |
|
ashok
|
6c082ebf09
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
6032ccd6c8
|
changes
|
8 months ago |
|
ashok
|
bacfa31aee
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
ac7fdcd06c
|
changes in consumption
|
8 months ago |
|
ashok
|
7699cfdd4d
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
2e59a1a5a8
|
changes
|
8 months ago |
|
ashok
|
66a73cd07d
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
b5dcc1bf4c
|
chsnes
|
8 months ago |
|
ashok
|
a6c9d5e10a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
0b6d4c0ecc
|
areas will be added in zones
|
8 months ago |
|
ashok
|
16dd30050d
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
d37ea75caf
|
reprtingManger self added
|
8 months ago |
|
ashok
|
046ea92cf1
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
b92fd287ad
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
e5ba590b11
|
states and cites get apis
|
8 months ago |
|
ashok
|
d608ceb4c0
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
7c5f7d59bb
|
chnages
|
8 months ago |
|
ashok
|
6267d2de57
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
c442cbf52d
|
changes
|
8 months ago |
|
ashok
|
02bb3f9310
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
407370d26f
|
changes
|
8 months ago |
|
ashok
|
cbe1990600
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
8515b26c37
|
changes
|
8 months ago |
|
ashok
|
0cc06d56d4
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
2f55e2dc81
|
chyanges
|
8 months ago |
|
ashok
|
2326408d39
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
e7df44c8b2
|
changes
|
8 months ago |
|
ashok
|
d929ba0ecf
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
296e8c6ba9
|
changes
|
8 months ago |
|
ashok
|
4619ba0870
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
e48f592e95
|
changes
|
8 months ago |
|
ashok
|
992d34f27a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
183961299a
|
changes
|
8 months ago |
|
ashok
|
b8f1321f3c
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
256755c1d9
|
motoraction with notifications
|
8 months ago |
|
ashok
|
91b0a46471
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
654fa9792f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
477fedcaaa
|
reverted officename based zones
|
8 months ago |
|
ashok
|
2c590f7289
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
96c781b6f4
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Varun
|
d57129b857
|
this commit previos one works fine with runtime
|
8 months ago |
|
ashok
|
d0c8b65fdd
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
a13a147ca8
|
comany name and city based zones
|
8 months ago |
|
ashok
|
a806f51813
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
|
Bhaskar
|
b8e5ece0b2
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
8 months ago |
