admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity
2,580 Commits 250 Branches 0 Tags
Commit Graph

2580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikas Nale
47d0e332f1 add blog container 2025-09-10 10:35:36 +05:30
pramod.mahajan
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
Kartik Sharma
c9ccd46385 Meaningful Message Required When No Reports Found in Selected Date Range 2025-09-10 04:45:29 +00:00
pramod.mahajan
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
Kartik Sharma
614d61e6e9 Invalid Date Displayed Instead of "NA" in Employee List 2025-09-10 04:43:23 +00:00
pramod.mahajan
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
Kartik Sharma
20077a137f Master Page - Grid alignment 2025-09-10 04:42:46 +00:00
pramod.mahajan
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
Kartik Sharma
b50b6bc454 Address field label is breaking into multiple lines in Employee Profile tab 2025-09-10 04:42:12 +00:00
pramod.mahajan
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
pramod mahajan
e454917763 refactored notes list 2025-09-10 02:41:59 +05:30
pramod mahajan
b113675cc2 contact Active and InActive refactored 2025-09-10 00:07:34 +05:30
pramod mahajan
025b13ea64 reafctor contact list with filter 2025-09-09 20:04:48 +05:30
pramod mahajan
755eb94ae3 added padding and marging at project feature permission card 2025-09-09 15:41:27 +05:30
pramod mahajan
1138bdf009 display properly version list 2025-09-09 15:06:25 +05:30
Vikas Nale
2642532b60 handle animations 2025-09-09 15:02:59 +05:30
pramod mahajan
67d399e3d3 set proerly alignment for label and value 2025-09-09 14:44:38 +05:30
pramod mahajan
fdc377cc3a employee joing date display regular local format 2025-09-09 14:30:08 +05:30
pramod mahajan
1bd951636a added proper msg showing whenver user did opertion for delete and restore 2025-09-09 14:27:26 +05:30
pramod mahajan
13a517f998 show msg once restored document 2025-09-09 14:13:39 +05:30
pramod mahajan
d5b3c25b45 added flag for pick future date or not 2025-09-09 13:31:30 +05:30
pramod mahajan
f8466e5f4a changed text font of SelectMulti tag value scondaru to semibold 2025-09-09 13:17:47 +05:30
Kartik Sharma
6998714fea Contact Number Field Accepts More Than 10 Digits in Create/Update Contact 2025-09-09 12:51:19 +05:30
pramod mahajan
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
pramod mahajan
49b89f74ff added view, upload,update and delete permissions 2025-09-09 12:49:21 +05:30
Kartik Sharma
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
Kartik Sharma
8d44606b0b Changes In Popup of Document. 2025-09-09 12:38:11 +05:30
pramod mahajan
b91487712d initially contactfilter added 2025-09-09 12:09:03 +05:30
Vikas Nale
6ca6ec31f7 landing page modifications 2025-09-09 12:06:10 +05:30
Vikas Nale
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
pramod mahajan
1abed1de3a managebucket component is split 2025-09-09 01:49:31 +05:30
Kartik Sharma
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
Kartik Sharma
4295e7d8d6 UI Changes in Document Details popup. 2025-09-08 16:04:13 +05:30
pramod mahajan
f72b7c62c8 add RootRedirect for "/" path to handle login and dashboard routing 2025-09-08 15:55:50 +05:30
pramod mahajan
01a3f5809a login Opt will be expire in % min 2025-09-08 15:17:43 +05:30
pramod mahajan
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
pramod mahajan
da8d63ce62 changed msg whenenver emp not found- "No team members assigned yet" 2025-09-08 15:06:24 +05:30
Kartik Sharma
ef0eff98f8 Remove unwanted icon 2025-09-08 14:55:33 +05:30
Kartik Sharma
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
Kartik Sharma
97a4a4593e Changes In Popup of Document Manager popup. 2025-09-08 14:54:15 +05:30
Vikas Nale
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
Vikas Nale
db38c5fefa Merge branch 'Issues_Sep_1W' into Kartik_Bug#1052 2025-09-08 09:11:06 +00:00
Vikas Nale
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
pramod mahajan
63a5f7b902 normalize projectId from localStorage to avoid "null" string 2025-09-08 14:22:23 +05:30
pramod mahajan
ace507232a changed dashboard route "/" to "/dashboard" 2025-09-08 12:48:19 +05:30
Vikas Nale
f9876c6d52 spell correction 2025-09-08 12:40:14 +05:30
Vikas Nale
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
Vikas Nale
698c1b7b16 add new images 
replase class= with className=
 2025-09-08 12:32:16 +05:30
Vikas Nale
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
pramod mahajan
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