|
|
0815745b18
|
added rootdiret component
|
2025-09-10 20:44:55 +05:30 |
|
|
|
ae3258cb04
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Landing_pages
|
2025-09-10 20:44:14 +05:30 |
|
|
|
aec6bd64ff
|
Merge pull request 'Added Document Managment feature' (#388) from Document_Manag into main
Reviewed-on: #388
Merged
|
2025-09-10 14:34:35 +00:00 |
|
|
|
eea36a2722
|
handle delete master modal
|
2025-09-10 20:01:06 +05:30 |
|
|
|
1a7e77c814
|
structured code
|
2025-09-10 19:09:55 +05:30 |
|
|
|
b1a2250c48
|
imported missing routes during merged
|
2025-09-10 19:03:29 +05:30 |
|
|
|
f20c3a64f6
|
added proper modal size for Master Modal - Application Role
|
2025-09-10 19:00:07 +05:30 |
|
|
|
ebab03dc9f
|
updated method for update contact category
|
2025-09-10 18:52:09 +05:30 |
|
|
|
b88b12aa74
|
imported missing compoent at AppRoutes
|
2025-09-10 18:18:53 +05:30 |
|
|
|
04df99634c
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Landing_pages
|
2025-09-10 18:16:17 +05:30 |
|
|
|
691fd9208f
|
fixed alignment address value at emplt about
|
2025-09-10 12:28:07 +05:30 |
|
|
|
45b21d3e73
|
restric open modal when came at admisitrator page
|
2025-09-10 11:33:44 +05:30 |
|
|
|
3db6cc2100
|
added modal, that was missing during merged
|
2025-09-10 11:29:01 +05:30 |
|
|
|
b934527cf5
|
added manually changed
|
2025-09-10 10:41:26 +05:30 |
|
|
|
bac62e1fa7
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
# Conflicts:
# src/components/Employee/EmpOverview.jsx
|
2025-09-10 10:38:13 +05:30 |
|
|
|
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 |
|
|
|
755eb94ae3
|
added padding and marging at project feature permission card
|
2025-09-09 15:41:27 +05:30 |
|
|
|
1138bdf009
|
display properly version list
|
2025-09-09 15:06:25 +05:30 |
|
|
|
67d399e3d3
|
set proerly alignment for label and value
|
2025-09-09 14:44:38 +05:30 |
|
|
|
fdc377cc3a
|
employee joing date display regular local format
|
2025-09-09 14:30:08 +05:30 |
|
|
|
1bd951636a
|
added proper msg showing whenver user did opertion for delete and restore
|
2025-09-09 14:27:26 +05:30 |
|
|
|
13a517f998
|
show msg once restored document
|
2025-09-09 14:13:39 +05:30 |
|
|
|
d5b3c25b45
|
added flag for pick future date or not
|
2025-09-09 13:31:30 +05:30 |
|
|
|
f8466e5f4a
|
changed text font of SelectMulti tag value scondaru to semibold
|
2025-09-09 13:17:47 +05:30 |
|
|
|
6998714fea
|
Contact Number Field Accepts More Than 10 Digits in Create/Update Contact
|
2025-09-09 12:51:19 +05:30 |
|
|
|
98546afc1a
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
|
2025-09-09 12:49:35 +05:30 |
|
|
|
49b89f74ff
|
added view, upload,update and delete permissions
|
2025-09-09 12:49:21 +05:30 |
|
|
|
7a5fc509fb
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
|
2025-09-09 12:38:14 +05:30 |
|
|
|
8d44606b0b
|
Changes In Popup of Document.
|
2025-09-09 12:38:11 +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 |
|
