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

2245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pramod.mahajan
f20ff7eb73 Merge pull request 'Created bucket card is visible in middle of Manage Buckets popup & after refresh page it displayed at left corner.' (#393) from Kartik_Bug#976 into Issues_Sep_1W_V2 
Reviewed-on: #393
Merged
 2025-09-13 10:10:32 +00:00
Kartik Sharma
ce59869827 Created bucket card is visible in middle of Manage Buckets popup & after refresh page it displayed at left corner. 2025-09-13 10:10:32 +00:00
pramod.mahajan
d77e3c5f03 Merge pull request 'Standardize All Buttons in Expenses Module to Match Website-Wide Button Style' (#391) from Kartik_Bug#830 into Issues_Sep_1W_V2 
Reviewed-on: #391
Merged
 2025-09-13 10:06:14 +00:00
Kartik Sharma
2f2ddb0576 Standardize All Buttons in Expenses Module to Match Website-Wide Button Style 2025-09-13 10:06:14 +00:00
pramod.mahajan
2e14fc862d Merge pull request 'Forgot Password – Reset link not sent, error shown for all valid emails' (#389) from Kartik_Bug#962 into Issues_Sep_1W_V2 
Reviewed-on: #389
Merged
 2025-09-13 10:05:34 +00:00
Kartik Sharma
84500f6913 Forgot Password – Reset link not sent, error shown for all valid emails 2025-09-13 10:05:34 +00:00
pramod.mahajan
2790f50275 Merge pull request 'Password Field UI Not Proper – White Background Not Covering Full Field' (#386) from Kartik_Bug#1015 into Issues_Sep_1W_V2 
Reviewed-on: #386
Merged
 2025-09-13 10:04:39 +00:00
Kartik Sharma
8c48b83581 Password Field UI Not Proper – White Background Not Covering Full Field 2025-09-13 10:04:39 +00:00
pramod.mahajan
f992dbeaf1 Merge pull request 'Username and Password Fields Should Auto-Trim Spaces on Login' (#385) from Kartik_Bug#1016 into Issues_Sep_1W_V2 
Reviewed-on: #385
Merged
 2025-09-13 10:03:31 +00:00
Kartik Sharma
d1098e64a7 Username and Password Fields Should Auto-Trim Spaces on Login 2025-09-13 10:03:31 +00:00
pramod.mahajan
212e969258 Merge pull request 'New Password Field on Reset Password Page Should Be Empty' (#384) from Kartik_Bug#1071 into Issues_Sep_1W_V2 
Reviewed-on: #384
Merged
 2025-09-13 10:02:45 +00:00
Kartik Sharma
9de1613bd9 New Password Field on Reset Password Page Should Be Empty 2025-09-13 10:02:45 +00:00
pramod mahajan
c83de16466 added missed outed confirm modal inside employee for suspend emp 2025-09-11 11:09:46 +05:30
pramod.mahajan
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
pramod mahajan
eea36a2722 handle delete master modal 2025-09-10 20:01:06 +05:30
pramod mahajan
1a7e77c814 structured code 2025-09-10 19:09:55 +05:30
pramod mahajan
b1a2250c48 imported missing routes during merged 2025-09-10 19:03:29 +05:30
pramod mahajan
f20c3a64f6 added proper modal size for Master Modal - Application Role 2025-09-10 19:00:07 +05:30
pramod mahajan
ebab03dc9f updated method for update contact category 2025-09-10 18:52:09 +05:30
pramod mahajan
691fd9208f fixed alignment address value at emplt about 2025-09-10 12:28:07 +05:30
pramod mahajan
45b21d3e73 restric open modal when came at admisitrator page 2025-09-10 11:33:44 +05:30
pramod mahajan
3db6cc2100 added modal, that was missing during merged 2025-09-10 11:29:01 +05:30
pramod mahajan
b934527cf5 added manually changed 2025-09-10 10:41:26 +05:30
Vikas Nale
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
Vikas Nale
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
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
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
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
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
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