|
|
0ccd00d3f7
|
error fixed during occured rebase
|
2025-07-14 14:30:49 +05:30 |
|
|
|
c0e9c1e2b9
|
Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
|
2025-07-14 14:21:44 +05:30 |
|
|
|
39f0908fc0
|
fixed error during rebase
|
2025-07-14 14:21:36 +05:30 |
|
|
|
50585e1fbd
|
rebase from main
|
2025-07-14 14:21:35 +05:30 |
|
|
|
85d10e3b17
|
Creating a custom hook for ImageGallery to call an API.
|
2025-07-14 14:21:05 +05:30 |
|
|
|
94358c7aa2
|
Changes in Date picker .
|
2025-07-14 14:21:04 +05:30 |
|
|
|
6f6e688249
|
In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days).
|
2025-07-14 14:20:28 +05:30 |
|
|
|
b8949b3b71
|
In filter DatePicker should not display dates in Image Gallery.
|
2025-07-14 14:20:28 +05:30 |
|
|
|
f8abcc8aa8
|
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
|
2025-07-14 14:19:56 +05:30 |
|
|
|
e3d7d6005b
|
Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 14:19:56 +05:30 |
|
|
|
a6f55f31f3
|
Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 14:19:55 +05:30 |
|
|
|
41f9d4d39a
|
Ensure all pages maintain a consistent size, even when there's less data to display.
|
2025-07-14 14:17:59 +05:30 |
|
|
|
0793dc28fb
|
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
|
2025-07-14 14:17:41 +05:30 |
|
|
|
98767fc6af
|
Increase the size of table in Projects Directory and show text in center and add 200 px height.
|
2025-07-14 14:17:05 +05:30 |
|
|
|
2dc37e04c6
|
Sizing for the projects directory has been corrected.
|
2025-07-14 14:17:04 +05:30 |
|
|
|
718fb73c5d
|
UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.
|
2025-07-14 14:16:08 +05:30 |
|
|
|
a381b58851
|
Increase the size of Tabs text in Attendance and Projects.
|
2025-07-14 14:14:13 +05:30 |
|
|
|
367290a3fb
|
rebase from main
|
2025-07-14 14:10:25 +05:30 |
|
|
|
94947c7c05
|
Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
|
2025-07-14 13:25:37 +05:30 |
|
|
|
88857c3255
|
Creating a custom hook for ImageGallery to call an API.
|
2025-07-14 13:25:31 +05:30 |
|
|
|
fab4499746
|
Changes in Date picker .
|
2025-07-14 13:25:31 +05:30 |
|
|
|
1b011dfe7d
|
In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days).
|
2025-07-14 13:25:13 +05:30 |
|
|
|
03b918b8e7
|
In filter DatePicker should not display dates in Image Gallery.
|
2025-07-14 13:25:13 +05:30 |
|
|
|
26d2e82116
|
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
|
2025-07-14 13:24:54 +05:30 |
|
|
|
b4fa62549d
|
Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 13:24:54 +05:30 |
|
|
|
32757c6796
|
Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 13:24:40 +05:30 |
|
|
|
cefc475c0a
|
Ensure all pages maintain a consistent size, even when there's less data to display.
|
2025-07-14 13:24:13 +05:30 |
|
|
|
10cf207677
|
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
|
2025-07-14 13:24:13 +05:30 |
|
|
|
331a60a899
|
Increase the size of table in Projects Directory and show text in center and add 200 px height.
|
2025-07-14 13:24:00 +05:30 |
|
|
|
62c178bd18
|
UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.
|
2025-07-14 13:24:00 +05:30 |
|
|
|
45d60b76a0
|
Increase the size of Tabs text in Attendance and Projects.
|
2025-07-14 13:23:38 +05:30 |
|
|
|
c0566f8281
|
Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
|
2025-07-14 12:58:48 +05:30 |
|
|
|
7343e733ea
|
Creating a custom hook for ImageGallery to call an API.
|
2025-07-14 12:58:41 +05:30 |
|
|
|
4201326e27
|
Changes in Date picker .
|
2025-07-14 12:58:41 +05:30 |
|
|
|
08d8f0b651
|
In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days).
|
2025-07-14 12:58:24 +05:30 |
|
|
|
ae46350c51
|
In filter DatePicker should not display dates in Image Gallery.
|
2025-07-14 12:58:24 +05:30 |
|
|
|
1d32632be7
|
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
|
2025-07-14 12:58:00 +05:30 |
|
|
|
3f245bf62b
|
Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 12:58:00 +05:30 |
|
|
|
f7e66ce28f
|
Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 12:57:39 +05:30 |
|
|
|
b1c0773c33
|
Ensure all pages maintain a consistent size, even when there's less data to display.
|
2025-07-14 12:57:12 +05:30 |
|
|
|
770c8e3e91
|
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
|
2025-07-14 12:56:59 +05:30 |
|
|
|
ec79e93cf2
|
Increase the size of table in Projects Directory and show text in center and add 200 px height.
|
2025-07-14 12:56:35 +05:30 |
|
|
|
d539bd67f1
|
UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.
|
2025-07-14 12:56:35 +05:30 |
|
|
|
a1f232d65b
|
Increase the size of Tabs text in Attendance and Projects.
|
2025-07-14 12:56:16 +05:30 |
|
|
|
42bceef654
|
Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
|
2025-07-14 12:52:19 +05:30 |
|
|
|
b9281a3955
|
Creating a custom hook for ImageGallery to call an API.
|
2025-07-14 12:51:48 +05:30 |
|
|
|
47bd782cdf
|
Changes in Date picker .
|
2025-07-14 12:51:48 +05:30 |
|
|
|
89cabd73dd
|
In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days).
|
2025-07-14 12:51:25 +05:30 |
|
|
|
a3db40a86a
|
In filter DatePicker should not display dates in Image Gallery.
|
2025-07-14 12:51:25 +05:30 |
|
|
|
17271f1900
|
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
|
2025-07-14 12:50:36 +05:30 |
|
|
|
70d6684bbe
|
Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 12:50:35 +05:30 |
|
|
|
d4c4fa7304
|
Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 12:50:17 +05:30 |
|
|
|
73b07904d2
|
Ensure all pages maintain a consistent size, even when there's less data to display.
|
2025-07-14 12:48:48 +05:30 |
|
|
|
ded2f73cc0
|
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
|
2025-07-14 12:47:14 +05:30 |
|
|
|
c8166114c4
|
Increase the size of table in Projects Directory and show text in center and add 200 px height.
|
2025-07-14 12:46:56 +05:30 |
|
|
|
eae0669be1
|
UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.
|
2025-07-14 12:46:56 +05:30 |
|
|
|
db8ecec49e
|
Increase the size of Tabs text in Attendance and Projects.
|
2025-07-14 12:45:46 +05:30 |
|
|
|
bca930fb3c
|
Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
|
2025-07-14 12:39:07 +05:30 |
|
|
|
6125d48119
|
In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled.
|
2025-07-14 12:29:59 +05:30 |
|
|
|
4350a1f1aa
|
Creating a custom hook for ImageGallery to call an API.
|
2025-07-14 12:29:58 +05:30 |
|
|
|
7558cbf8c4
|
Implementing a paste functionality in OTP login where the user can directly paste the OTP.
|
2025-07-14 12:29:58 +05:30 |
|
|
|
3fa5a2ba45
|
Changes in Date picker .
|
2025-07-14 12:29:58 +05:30 |
|
|
|
2f37dba1a2
|
In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days).
|
2025-07-14 12:29:58 +05:30 |
|
|
|
db60da45d9
|
In filter DatePicker should not display dates in Image Gallery.
|
2025-07-14 12:29:58 +05:30 |
|
|
|
a3f24af524
|
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
|
2025-07-14 12:29:58 +05:30 |
|
|
|
75dfe1f6aa
|
Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 12:29:58 +05:30 |
|
|
|
25ff406b87
|
Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-14 12:29:58 +05:30 |
|
|
|
e26fafeba3
|
Ensure all pages maintain a consistent size, even when there's less data to display.
|
2025-07-14 12:29:27 +05:30 |
|
|
|
e2eaced0ea
|
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
|
2025-07-14 12:29:27 +05:30 |
|
|
|
386c98bdc3
|
Increase the size of table in Projects Directory and show text in center and add 200 px height.
|
2025-07-14 12:29:27 +05:30 |
|
|
|
b659dbd9ea
|
Sizing for the projects directory has been corrected.
|
2025-07-14 12:29:27 +05:30 |
|
|
|
117dae81e4
|
UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.
|
2025-07-14 12:28:21 +05:30 |
|
|
|
63c6d74434
|
On Change Password popup cross button is now working on click on it.
|
2025-07-14 12:28:21 +05:30 |
|
|
|
f0ab6efb36
|
Increase the size of Tabs text in Attendance and Projects.
|
2025-07-14 12:28:21 +05:30 |
|
|
|
fc8a3ce109
|
There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost."
|
2025-07-14 12:28:21 +05:30 |
|
|
|
bb32c3925d
|
Assigned Task Should Be Visible to Normal User Without Showing Assign Button.
|
2025-07-14 12:28:21 +05:30 |
|
|
|
f7ea1aa60a
|
Saved Username and Password Not Visible on Login Page Load
|
2025-07-14 12:27:53 +05:30 |
|
|
|
59190cf086
|
Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging.
|
2025-07-14 12:27:53 +05:30 |
|
|
|
09e7ba3695
|
Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery.
|
2025-07-14 12:27:53 +05:30 |
|
|
|
c12efe3061
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
|
2025-07-11 17:47:19 +05:30 |
|
|
|
a14f2b0738
|
Merge pull request 'In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled.' (#250) from Kartik_Bug#730 into Issues_July_2W
Reviewed-on: #250
Merged
|
2025-07-11 11:06:53 +00:00 |
|
|
|
a73ac284bd
|
In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled.
|
2025-07-11 16:25:03 +05:30 |
|
|
|
6dc6ee6f3c
|
Merge pull request 'Creating a custom hook for ImageGallery to call an API.' (#249) from Kartik_Task#728 into Issues_July_2W
Reviewed-on: #249
Merged
|
2025-07-11 07:46:07 +00:00 |
|
|
|
f8fb095896
|
Creating a custom hook for ImageGallery to call an API.
|
2025-07-11 13:13:44 +05:30 |
|
|
|
b389839b94
|
Merge pull request 'Implementing a paste functionality in OTP login where the user can directly paste the OTP.' (#248) from Kartik_Bug#727 into Issues_July_2W
Reviewed-on: #248
Merged
|
2025-07-11 07:20:12 +00:00 |
|
|
|
a288f5f9de
|
Implementing a paste functionality in OTP login where the user can directly paste the OTP.
|
2025-07-11 07:20:12 +00:00 |
|
|
|
9a9ff4460f
|
Merge pull request 'In filter DatePicker should not display dates in Image Gallery.' (#238) from Kartik_Bug#679 into Issues_July_2W
Reviewed-on: #238
Merged
|
2025-07-11 07:13:52 +00:00 |
|
|
|
f5c6382952
|
Changes in Date picker .
|
2025-07-11 07:13:52 +00:00 |
|
|
|
b36986d1c2
|
In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days).
|
2025-07-11 07:13:52 +00:00 |
|
|
|
788a096f00
|
In filter DatePicker should not display dates in Image Gallery.
|
2025-07-11 07:13:52 +00:00 |
|
|
|
0a0f0046cc
|
Merge pull request 'In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.' (#247) from Kartik_Bug#725 into Issues_July_2W
Reviewed-on: #247
Merged
|
2025-07-11 05:36:37 +00:00 |
|
|
|
722b85752a
|
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
|
2025-07-10 16:58:25 +05:30 |
|
|
|
200888ff99
|
Merge pull request 'Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.' (#237) from Kartik_Bug#650 into Issues_July_2W
Reviewed-on: #237
|
2025-07-10 05:22:26 +00:00 |
|
|
|
ab75fcf20c
|
Merge pull request 'Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.' (#244) from Kartik_Bug#640 into Issues_July_2W
Reviewed-on: #244
|
2025-07-10 05:20:53 +00:00 |
|
|
|
fc8f6375c1
|
Merge pull request 'UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.' (#236) from Kartik_bug#649 into Issues_July_2W
Reviewed-on: #236
|
2025-07-10 05:18:09 +00:00 |
|
|
|
bae48be2b5
|
Increase the size of table in Projects Directory and show text in center and add 200 px height.
|
2025-07-09 16:06:30 +05:30 |
|
|
|
588104a9dd
|
Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-09 15:15:53 +05:30 |
|
|
|
7bab8b7551
|
Ensure all pages maintain a consistent size, even when there's less data to display.
|
2025-07-09 13:32:12 +05:30 |
|
|
|
f53b88f946
|
Merge pull request 'On Change Password popup cross button is now working on click on it.' (#243) from Kartik_Bug#713 into Issues_July_2W
Reviewed-on: #243
|
2025-07-09 07:32:11 +00:00 |
|
|
|
9b99be6c0d
|
Merge pull request 'Increase the size of Tabs text in Attendance and Projects.' (#242) from Kartik_Bug#712 into Issues_July_2W
Reviewed-on: #242
|
2025-07-09 07:32:02 +00:00 |
|
|
|
3f43f56020
|
Merge pull request 'There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost."' (#241) from Kartik_Bug#681 into Issues_July_2W
Reviewed-on: #241
|
2025-07-09 07:27:48 +00:00 |
|
|
|
cbfaf3cf35
|
Merge pull request 'Assigned Task Should Be Visible to Normal User Without Showing Assign Button.' (#240) from Kartik_Bug#648 into Issues_July_2W
Reviewed-on: #240
|
2025-07-09 07:18:15 +00:00 |
|
|
|
2e66372f54
|
Merge pull request 'Saved Username and Password Not Visible on Login Page Load' (#239) from Kartik_Bug#678 into Issues_July_2W
Reviewed-on: #239
|
2025-07-09 07:16:12 +00:00 |
|
|
|
235106b9db
|
Merge pull request 'Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging.' (#235) from kartik_Bug#540 into Issues_July_2W
Reviewed-on: #235
|
2025-07-09 07:08:57 +00:00 |
|
|
|
31e5b48a4b
|
Merge pull request 'Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery.' (#233) from Kartik_Bug#667 into Issues_July_2W
Reviewed-on: #233
|
2025-07-09 07:06:18 +00:00 |
|
|
|
f8192ae1ca
|
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
|
2025-07-09 12:18:41 +05:30 |
|
|
|
0d5ac23df9
|
On Change Password popup cross button is now working on click on it.
|
2025-07-09 11:39:29 +05:30 |
|
|
|
cefd4e7319
|
Increase the size of Tabs text in Attendance and Projects.
|
2025-07-09 11:24:46 +05:30 |
|
|
|
ce011c4f14
|
There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost."
|
2025-07-09 10:45:46 +05:30 |
|
|
|
e3417287d3
|
Sizing for the projects directory has been corrected.
|
2025-07-09 10:20:32 +05:30 |
|
|
|
b2376bbad4
|
Assigned Task Should Be Visible to Normal User Without Showing Assign Button.
|
2025-07-08 15:23:56 +05:30 |
|
|
|
012c8faca8
|
Saved Username and Password Not Visible on Login Page Load
|
2025-07-08 13:34:30 +05:30 |
|
|
|
e1e4ba2b54
|
Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
|
2025-07-08 12:45:48 +05:30 |
|
|
|
3d8247a27b
|
UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.
|
2025-07-08 12:38:08 +05:30 |
|
|
|
9b63b2000e
|
Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging.
|
2025-07-08 12:35:02 +05:30 |
|
|
|
ad1db0f366
|
Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery.
|
2025-07-07 15:07:43 +05:30 |
|
