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

2306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pramod mahajan
2c378745fa changed label class of directory filter 2025-09-16 10:59:25 +05:30
pramod mahajan
080d2307ca removed unused code 2025-09-16 10:49:44 +05:30
pramod.mahajan
d2288ea967 Merge pull request 'Issues_Sep_1W_V2' (#402) from Issues_Sep_1W_V2 into Refactor_Directory 
Reviewed-on: #402
Merged
 2025-09-16 05:11:27 +00:00
Kartik Sharma
42086d7f3a Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Sep_1W_V2 2025-09-16 10:40:27 +05:30
Kartik Sharma
020020056e Changes in Activities DateRangePicket. 2025-09-15 18:19:11 +05:30
pramod mahajan
9b3ffdb33d changed input of search input text- search at Contact 2025-09-15 17:32:31 +05:30
pramod.mahajan
d70c8e5995 Merge pull request 'Filter dropdown in Assign Task popup does not close on outside click' (#396) from Kartik_Bug#1123 into Issues_Sep_1W_V2 
Reviewed-on: #396
Merged
 2025-09-15 11:52:15 +00:00
Kartik Sharma
e6e90c7d4e Filter dropdown in Assign Task popup does not close on outside click 2025-09-15 11:52:15 +00:00
pramod.mahajan
19241cc556 Merge pull request 'Remove Extra Line Below "No Contact Found" Message in Directory' (#400) from Kartik_Bug#1115 into Refactor_Directory 
Reviewed-on: #400
Merged
 2025-09-15 11:51:46 +00:00
Kartik Sharma
7c2744058d Remove Extra Line Below "No Contact Found" Message in Directory 2025-09-15 11:51:46 +00:00
pramod.mahajan
a963176c95 Merge pull request 'Message should be inside card' (#399) from Kartik_Bug#1080 into Refactor_Directory 
Reviewed-on: #399
Merged
 2025-09-15 11:48:52 +00:00
Kartik Sharma
6bc8c65c81 Message should be inside card 2025-09-15 11:48:52 +00:00
pramod.mahajan
45bd5a7f66 Merge pull request 'Directory - Contacts Exported to Excel does not format properly' (#397) from Kartik_Bug#1064 into Refactor_Directory 
Reviewed-on: #397
Merged
 2025-09-15 11:47:56 +00:00
Kartik Sharma
e179a267aa Directory - Contacts Exported to Excel does not format properly 2025-09-15 11:47:56 +00:00
pramod.mahajan
9c51378963 Merge pull request 'Employee Profile Page Not Updating without refresh page ,After Edit' (#398) from Kartik_Bug#909 into Issues_Sep_1W_V2 
Reviewed-on: #398
Merged
 2025-09-15 11:37:17 +00:00
pramod mahajan
4927680fe3 fixed going wrong request for Expense payload - Transaction 2025-09-15 17:00:36 +05:30
Kartik Sharma
9af7a5ceb2 Employee Profile Page Not Updating without refresh page ,After Edit 2025-09-15 15:19:40 +05:30
pramod mahajan
94eb283b2d added permission for managr task 2025-09-13 19:01:08 +05:30
pramod mahajan
0e3a634205 fixed permission add and remove updation 2025-09-13 18:16:56 +05:30
pramod mahajan
2ef56e7f83 added correct msg for contact person 2025-09-13 16:10:17 +05:30
pramod.mahajan
d80fa27906 Merge pull request 'Remove Required Indicator from Tags Field in Document Upload' (#392) from Kartik_Bug#1104 into Issues_Sep_1W_V2 
Reviewed-on: #392
Merged
 2025-09-13 10:13:18 +00:00
Kartik Sharma
70110192f4 Remove Required Indicator from Tags Field in Document Upload 2025-09-13 10:13:18 +00:00
pramod.mahajan
548597ed4f Merge pull request 'Display Only "Re-activate" Button for Inactive Employees in Action Column' (#394) from Kartik_Bug#1113 into Issues_Sep_1W_V2 
Reviewed-on: #394
Merged
 2025-09-13 10:11:25 +00:00
Kartik Sharma
75ca3d1504 Display Only "Re-activate" Button for Inactive Employees in Action Column 2025-09-13 10:11:25 +00:00
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
Kartik Sharma
9676d45710 When the clear button hit api for full response. 2025-09-12 17:16:34 +05:30
Kartik Sharma
7e5b6952f5 Apply functionality for Both Notes and Contact filter 2025-09-12 17:09:48 +05:30
Kartik Sharma
0484de498c Changes in UI of Directory Notes Tabs and all the popups. 2025-09-12 16:11:31 +05:30
pramod mahajan
a7ccaa2812 changed position of text- Active and In-Active 2025-09-12 13:08:07 +05:30
pramod mahajan
5fb7e89cb2 changed sequence of contact form buttons 2025-09-12 12:58:01 +05:30
pramod mahajan
2027bd3d17 all images path changed 2025-09-12 12:37:31 +05:30
pramod mahajan
ee9698f665 changed images path for landing page 2025-09-12 12:29:54 +05:30
pramod mahajan
25ec5a354c changed path of logo 2025-09-12 12:21:40 +05:30
pramod mahajan
8335c42935 added direct bucket permission 2025-09-12 12:04:24 +05:30
Vikas Nale
3963002a2d Merge branch 'landing_page_1' into Refactor_Directory 
# Conflicts:
#	src/pages/Home/LandingPage.css
 2025-09-11 18:14:31 +05:30
pramod mahajan
717264c9f9 fixed update and creation for contacts 2025-09-11 17:34:56 +05:30
pramod mahajan
1a04dd51fc Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-11 16:25:49 +05:30
pramod mahajan
c83de16466 added missed outed confirm modal inside employee for suspend emp 2025-09-11 11:09:46 +05:30
pramod mahajan
b51b3db9ec added missing assset 2025-09-11 10:51:46 +05:30