|
|
bab312b9ee
|
Merge pull request 'Incorrect Old Password Shows Improper Error Message on Change Password Screen' (#196) from Kartik_Bug#490 into Issue_Jun_1W_2
Reviewed-on: #196
|
2025-06-09 12:31:31 +00:00 |
|
|
|
e079be39db
|
Incorrect Old Password Shows Improper Error Message on Change Password Screen
|
2025-06-09 17:53:17 +05:30 |
|
|
|
69a907860b
|
Merge pull request 'Employee Details Page Showing "NA" for All Fields.' (#195) from Kartik_Bug#485 into Issue_Jun_1W_2
Reviewed-on: #195
|
2025-06-09 11:56:48 +00:00 |
|
|
|
63980db512
|
Employee Details Page Showing "NA" for All Fields.
|
2025-06-09 11:56:48 +00:00 |
|
|
|
1390c655b4
|
Merge pull request 'Implement a spinner in the Daily Progress Report to indicate when data is being loaded.' (#194) from Kartik_Bug#487 into Issue_Jun_1W_2
Reviewed-on: #194
|
2025-06-09 11:54:49 +00:00 |
|
|
|
19f58345d9
|
add cosmati changes
|
2025-06-09 11:54:49 +00:00 |
|
|
|
e2f3814934
|
Implement a spinner in the Daily Progress Report to indicate when data is being loaded.
|
2025-06-09 11:54:49 +00:00 |
|
|
|
9da151ca9a
|
Merge pull request 'Creating a Change Password popup.' (#189) from Kartik_Task#460 into Issue_Jun_1W_2
Reviewed-on: #189
|
2025-06-09 11:38:35 +00:00 |
|
|
|
3857fec32e
|
add cosmatic changes
|
2025-06-09 11:38:35 +00:00 |
|
|
|
3a45f80f36
|
Changes in Change Password Popup improve its layout and functionality.
|
2025-06-09 11:38:35 +00:00 |
|
|
|
b4b64c4c91
|
Creating a Change Password page.
|
2025-06-09 11:38:35 +00:00 |
|
Pramod Mahajan
|
77fb787d46
|
removed console.log
|
2025-06-09 12:41:57 +05:30 |
|
Pramod Mahajan
|
00e61988a8
|
Merge branch 'Issue_Jun_1W_2' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_Jun_1W_2
|
2025-06-09 12:37:14 +05:30 |
|
|
|
9e03e6ae19
|
Handle conditon to hide unwanted OR label
|
2025-06-09 11:49:34 +05:30 |
|
|
|
945d79a250
|
Merge branch 'pramod_Task#482' into Issue_Jun_1W_2
# Conflicts:
# src/pages/authentication/LoginPage.jsx
|
2025-06-09 11:47:03 +05:30 |
|
|
|
d37068b8d9
|
Modify typo
|
2025-06-09 11:46:00 +05:30 |
|
|
|
9ba8a1501b
|
Merge pull request 'When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate.' (#192) from Kartik_bug#379 into Issue_Jun_1W_2
Reviewed-on: #192
|
2025-06-09 06:00:26 +00:00 |
|
|
|
ef47bbf8a4
|
When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate.
|
2025-06-09 06:00:26 +00:00 |
|
|
|
061c110524
|
Merge pull request 'Changes in Reset Password Page and adding field in Dialog box is " Change Password"' (#186) from Kartik_Task#470 into Issue_Jun_1W_2
Reviewed-on: #186
|
2025-06-09 05:48:47 +00:00 |
|
|
|
d5158a2151
|
Merge pull request 'Hide Page Number on Website Until Data Exceeds Records Limit.' (#188) from Kartik_Bug#475 into Issue_Jun_1W_2
Reviewed-on: #188
|
2025-06-09 05:46:12 +00:00 |
|
|
|
b6330502cb
|
Hide Page Number on Website Until Data Exceeds Records Limit.
|
2025-06-09 05:46:12 +00:00 |
|
|
|
c999307a5f
|
Merge pull request 'Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity.' (#187) from Kartik_Task#472 into Issue_Jun_1W_2
Reviewed-on: #187
|
2025-06-09 05:39:43 +00:00 |
|
|
|
26191bccfe
|
Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity.
|
2025-06-09 05:39:43 +00:00 |
|
Pramod Mahajan
|
fa4f784b6b
|
Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_Jun_1W_2
|
2025-06-07 23:42:15 +05:30 |
|
Pramod Mahajan
|
ab6316ef56
|
Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#482
|
2025-06-07 17:42:16 +05:30 |
|
Pramod Mahajan
|
d345977fdc
|
set constant time for expire time for OTP
|
2025-06-07 17:41:24 +05:30 |
|
Pramod Mahajan
|
8640a96901
|
set new route login through OTP
|
2025-06-07 17:40:49 +05:30 |
|
Pramod Mahajan
|
beeba834e2
|
added send and verify OTP api
|
2025-06-07 17:40:24 +05:30 |
|
Pramod Mahajan
|
def6524566
|
created new component for verify OTP
|
2025-06-07 17:40:03 +05:30 |
|
Pramod Mahajan
|
194087c0a3
|
added login with otp feature, added send otp api
|
2025-06-07 17:39:37 +05:30 |
|
|
|
40f4f2f254
|
Merge branch 'Kartik_Task#470' into Issue_Jun_1W_2
|
2025-06-06 18:37:40 +05:30 |
|
|
|
0053dbaf56
|
Changes in Reset Password Page and adding field in Dialog box is " Change Password"
|
2025-06-06 13:05:55 +00:00 |
|
|
|
b00fe50bae
|
Merge pull request 'Creating a Change Password Page and adding Change Password field in Dialog box.' (#185) from Kartik_Task#467 into Issue_Jun_1W_2
Reviewed-on: #185
|
2025-06-06 13:05:17 +00:00 |
|
|
|
96ed0428c4
|
Changes in Reset Password Page and adding field in Dialog box is " Change Password"
|
2025-06-05 18:06:58 +05:30 |
|
|
|
f3b16a9fc0
|
Creating a Change Password Page and adding Change Password field in Dialog box.
|
2025-06-05 17:57:53 +05:30 |
|
|
|
43270c6bf3
|
Merge pull request 'Todays date is not visible in Daily Progress Report.' (#183) from Kartik_Bug#449 into Issue_Jun_1W
Reviewed-on: #183
|
2025-06-05 05:26:06 +00:00 |
|
|
|
101baa2b78
|
Todays date is not visible in Daily Progress Report.
|
2025-06-05 05:26:06 +00:00 |
|
|
|
c553b36e25
|
Merge pull request 'In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come.' (#184) from Kartik_Bug#457 into Issue_Jun_1W
Reviewed-on: #184
|
2025-06-05 05:24:28 +00:00 |
|
|
|
4345c55247
|
In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come.
|
2025-06-04 17:11:55 +05:30 |
|
|
|
655db6ac74
|
Merge pull request 'Added Column Today's Planned to Project Infrastructure' (#182) from Ashutosh_Enhancement#276_TodaysPlanned into Issue_Jun_1W
Reviewed-on: #182
|
2025-06-03 11:59:46 +00:00 |
|
|
|
176535f53f
|
Added Column Today's Planned to Project Infrastructure
|
2025-06-03 11:59:46 +00:00 |
|
|
|
cfd5486fe2
|
Merge pull request 'In Teams Tab when we Assign a project then this dropdown not change its state .' (#181) from Kartik_Bug#442 into Issue_Jun_1W
Reviewed-on: #181
|
2025-06-03 11:56:04 +00:00 |
|
|
|
3486a6bc3a
|
In Teams Tab when we Assign a project then this dropdown not change its state .
|
2025-06-03 11:56:04 +00:00 |
|
|
|
412125e422
|
Merge pull request 'Adding a error message on InActive selection on Teams tab on Projects.' (#180) from Kartik_Bug#441 into Issue_Jun_1W
Reviewed-on: #180
|
2025-06-03 11:54:33 +00:00 |
|
|
|
cf8a67bc2c
|
Adding a error message on InActive selection on Teams tab on Projects.
|
2025-06-03 11:54:33 +00:00 |
|
|
|
18d848b697
|
Merge pull request 'In Report popup when we take value = 0 then giv error but now it is resolved.' (#179) from Kartik_Bug#436 into Issue_Jun_1W
Reviewed-on: #179
|
2025-06-03 11:53:32 +00:00 |
|
|
|
78bc8802d7
|
Merge pull request 'In Employee Management when we select Project then this toggle button will be disabled.' (#178) from Kartik_Bug#432 into Issue_Jun_1W
Reviewed-on: #178
|
2025-06-03 11:52:53 +00:00 |
|
|
|
5df397488a
|
In Employee Management when we select Project then this toggle button will be disabled.
|
2025-06-03 11:52:53 +00:00 |
|
|
|
4d1d3f8cca
|
Merge pull request 'Display completion percentage for each Work Area header' (#174) from pramod_Task-#438 into Issue_Jun_1W
Reviewed-on: #174
|
2025-06-03 11:47:18 +00:00 |
|
|
|
493689fb1a
|
Add progress bar for work area on Infra Page
|
2025-06-03 11:47:18 +00:00 |
|
