|
|
5ec5218dd6
|
Merge branch 'Issues_Sep_1W' into Document_Manag
# Conflicts:
# src/pages/Activities/DailyTask.jsx
# src/pages/master/MasterPage.jsx
|
2025-09-10 10:37:38 +05:30 |
|
|
|
b02893fd98
|
Merge pull request 'Meaningful Message Required When No Reports Found in Selected Date Range' (#379) from Kartik_Bug#1045 into Issues_Sep_1W
Reviewed-on: #379
Merged
|
2025-09-10 04:45:29 +00:00 |
|
|
|
c9ccd46385
|
Meaningful Message Required When No Reports Found in Selected Date Range
|
2025-09-10 04:45:29 +00:00 |
|
|
|
aa45731d8c
|
Merge pull request 'Invalid Date Displayed Instead of "NA" in Employee List' (#380) from Kartik_Bug#1039 into Issues_Sep_1W
Reviewed-on: #380
Merged
|
2025-09-10 04:43:23 +00:00 |
|
|
|
614d61e6e9
|
Invalid Date Displayed Instead of "NA" in Employee List
|
2025-09-10 04:43:23 +00:00 |
|
|
|
0e35194a82
|
Merge pull request 'Master Page - Grid alignment' (#381) from Kartik_Bug#1081 into Issues_Sep_1W
Reviewed-on: #381
Merged
|
2025-09-10 04:42:46 +00:00 |
|
|
|
20077a137f
|
Master Page - Grid alignment
|
2025-09-10 04:42:46 +00:00 |
|
|
|
1ff1bc9269
|
Merge pull request 'Address field label is breaking into multiple lines in Employee Profile tab' (#382) from Kartik_Bug#1096 into Issues_Sep_1W
Reviewed-on: #382
Merged
|
2025-09-10 04:42:12 +00:00 |
|
|
|
b50b6bc454
|
Address field label is breaking into multiple lines in Employee Profile tab
|
2025-09-10 04:42:12 +00:00 |
|
|
|
d87defbf9a
|
Merge pull request 'Contact Number Field Accepts More Than 10 Digits in Create/Update Contact' (#378) from Kartik_Bug#1090 into Issues_Sep_1W
Reviewed-on: #378
Merged
|
2025-09-10 04:41:43 +00:00 |
|
|
|
6998714fea
|
Contact Number Field Accepts More Than 10 Digits in Create/Update Contact
|
2025-09-09 12:51:19 +05:30 |
|
|
|
849709ad05
|
Merge pull request 'Toggle Button Functionality for Deleted Notes Not Working Correctly' (#375) from Kartik_Bug#1056 into Document_Manag
Reviewed-on: #375
|
2025-09-09 05:33:50 +00:00 |
|
|
|
1b98c60120
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
|
2025-09-08 16:04:16 +05:30 |
|
|
|
4295e7d8d6
|
UI Changes in Document Details popup.
|
2025-09-08 16:04:13 +05:30 |
|
|
|
f72b7c62c8
|
add RootRedirect for "/" path to handle login and dashboard routing
|
2025-09-08 15:55:50 +05:30 |
|
|
|
01a3f5809a
|
login Opt will be expire in % min
|
2025-09-08 15:17:43 +05:30 |
|
|
|
bb7e488bb0
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
|
2025-09-08 15:06:29 +05:30 |
|
|
|
da8d63ce62
|
changed msg whenenver emp not found- "No team members assigned yet"
|
2025-09-08 15:06:24 +05:30 |
|
|
|
ef0eff98f8
|
Remove unwanted icon
|
2025-09-08 14:55:33 +05:30 |
|
|
|
2a833196f8
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
|
2025-09-08 14:54:20 +05:30 |
|
|
|
97a4a4593e
|
Changes In Popup of Document Manager popup.
|
2025-09-08 14:54:15 +05:30 |
|
|
|
a112886897
|
Merge pull request 'Date Picker in Employee Attendance & Activity Tab Should Default to Last 7 Days' (#374) from Kartik_Bug#1052 into Issues_Sep_1W
Reviewed-on: #374
|
2025-09-08 09:11:24 +00:00 |
|
|
|
db38c5fefa
|
Merge branch 'Issues_Sep_1W' into Kartik_Bug#1052
|
2025-09-08 09:11:06 +00:00 |
|
|
|
c6f16249fd
|
Merge pull request 'Filter icon should not be displayed when no records are found in Daily Progress Report' (#373) from Kartik_Bug#1042 into Issues_Sep_1W
Reviewed-on: #373
|
2025-09-08 09:09:36 +00:00 |
|
|
|
63a5f7b902
|
normalize projectId from localStorage to avoid "null" string
|
2025-09-08 14:22:23 +05:30 |
|
|
|
ace507232a
|
changed dashboard route "/" to "/dashboard"
|
2025-09-08 12:48:19 +05:30 |
|
|
|
f9876c6d52
|
spell correction
|
2025-09-08 12:40:14 +05:30 |
|
|
|
6d86362e9e
|
Merge branch 'Landing_pages' into Document_Manag
# Conflicts:
# src/pages/authentication/LoginPage.jsx
# src/pages/employee/EmployeeList.jsx
# src/router/AppRoutes.jsx
|
2025-09-08 12:34:18 +05:30 |
|
|
|
698c1b7b16
|
add new images
replase class= with className=
|
2025-09-08 12:32:16 +05:30 |
|
|
|
e216ac16ef
|
Merge pull request 'Change the UI of all components and add stars for all mandatory fields.' (#370) from UI_Changes_PMS into Document_Manag
Reviewed-on: #370
|
2025-09-08 06:30:57 +00:00 |
|
|
|
0194c4427a
|
Merge branch 'UI_Changes_PMS' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS
|
2025-09-08 11:57:30 +05:30 |
|
|
|
ea022d37c8
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS
|
2025-09-08 11:50:58 +05:30 |
|
|
|
768f810465
|
All symbols will be same in all components.
|
2025-09-05 17:17:15 +05:30 |
|
|
|
7ed6a7e5b9
|
UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same.
|
2025-09-05 16:53:48 +05:30 |
|
|
|
5c59ac3115
|
Create Employee Change the date box into DatePicker.
|
2025-09-05 13:07:58 +05:30 |
|
|
|
7e81649841
|
Toggle Button Functionality for Deleted Notes Not Working Correctly
|
2025-09-05 12:45:28 +05:30 |
|
|
|
c568dc9108
|
Date Picker in Employee Attendance & Activity Tab Should Default to Last 7 Days
|
2025-09-05 12:33:43 +05:30 |
|
|
|
dcb2f59f5b
|
Filter icon should not be displayed when no records are found in Daily Progress Report
|
2025-09-05 12:26:57 +05:30 |
|
|
|
e39355c6fd
|
Changes in UI for Masters component.
|
2025-09-05 12:00:26 +05:30 |
|
|
|
f9fe987a94
|
changed useproject hook name
|
2025-09-05 11:58:36 +05:30 |
|
|
|
87221965de
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
|
2025-09-05 11:52:50 +05:30 |
|
|
|
6caad7850d
|
clear and structured code
|
2025-09-05 11:45:04 +05:30 |
|
|
|
8f8cbf27ef
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS
|
2025-09-05 11:44:27 +05:30 |
|
|
|
0db0edec1a
|
Masters Popup all heading show in Center align.
|
2025-09-05 11:19:35 +05:30 |
|
|
|
42b6802419
|
Merge pull request 'Issues_Aug_2W' (#371) from Issues_Aug_2W into main
Reviewed-on: #371
Merged
|
2025-09-05 05:45:32 +00:00 |
|
|
|
cabb1b01c9
|
don't changed project when move to one page to another page
|
2025-09-05 11:14:02 +05:30 |
|
|
|
f56fd23cbf
|
In Create Project popup change the noraml date selection to DatePicker.
|
2025-09-05 11:12:31 +05:30 |
|
|
|
6dfdaf3316
|
changed name useSelectedproject to useSelectedProject
|
2025-09-05 11:06:38 +05:30 |
|
|
|
4369705a2d
|
Merge branch 'Issues_Aug_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_2W
|
2025-09-05 10:53:35 +05:30 |
|
|
|
34654aae0a
|
: rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject
|
2025-09-05 10:53:05 +05:30 |
|
