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

2487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pramod.mahajan
3f4b7d08d4 Merge pull request 'Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task' (#435) from Kartik_Task#1361 into Organization_Management 
Reviewed-on: #435
Merged
 2025-09-27 09:37:36 +00:00
Kartik Sharma
7ac3268514 Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task 2025-09-27 09:37:36 +00:00
pramod.mahajan
f8740472de Merge pull request 'Scrollbar Behavior in "Choose Organization" (Projects → Organization Tab)' (#436) from Kartik_Task#1374 into Organization_Management 
Reviewed-on: #436
Merged
 2025-09-27 09:36:27 +00:00
Kartik Sharma
be72ca9a58 Scrollbar Behavior in "Choose Organization" (Projects → Organization Tab) 2025-09-27 09:36:27 +00:00
pramod.mahajan
c71c00c0f7 Merge pull request 'Selected Building and Floor Should Persist While Creating Work Area and Activity (Project Infrastructure)' (#438) from Kartik_Bug#1372 into Organization_Management 
Reviewed-on: #438
Merged
 2025-09-27 09:35:27 +00:00
Kartik Sharma
112e0ff798 Selected Building and Floor Should Persist While Creating Work Area and Activity (Project Infrastructure) 2025-09-27 09:35:27 +00:00
pramod.mahajan
96eb030457 Merge pull request 'Tenant Creation – Error banner for plan selection/currency should not be shown' (#439) from Kartik_Bug#1370 into Organization_Management 
Reviewed-on: #439
Merged
 2025-09-27 09:34:48 +00:00
Kartik Sharma
a873ace109 Tenant Creation – Error banner for plan selection/currency should not be shown 2025-09-27 09:34:48 +00:00
pramod.mahajan
fb164bd2f2 Merge pull request 'Switch Tenant & Goto workspace option label should be “Switch Workspace' (#440) from Kartik_Bug#1366 into Organization_Management 
Reviewed-on: #440
Merged
 2025-09-27 09:34:07 +00:00
Kartik Sharma
0d6708619f Switch Tenant & Goto workspace option label should be “Switch Workspace 2025-09-27 09:34:07 +00:00
pramod.mahajan
edba191a2e Merge pull request 'Tenant Creation – Logo removed when navigating back from second page' (#441) from Kartik_Bug#1369 into Organization_Management 
Reviewed-on: #441
Merged
 2025-09-27 09:33:46 +00:00
Kartik Sharma
ddfe09b570 Tenant Creation – Logo removed when navigating back from second page 2025-09-27 09:33:46 +00:00
pramod.mahajan
acb899dd2e Merge pull request 'Change the label in Assign Organization.' (#433) from Kartik_Bug#1353 into Organization_Management 
Reviewed-on: #433
Merged
 2025-09-27 09:31:52 +00:00
Kartik Sharma
ae66cb3705 Change the label in Assign Organization. 2025-09-27 09:31:52 +00:00
pramod.mahajan
d52fa00de0 Merge pull request 'Team Assign ToProject : With other Organization employees' (#437) from TeamAssignToProject into Organization_Management 
Reviewed-on: #437
Merged
 2025-09-27 09:29:59 +00:00
pramod.mahajan
ca8a41bb63 added style classes for footer 2025-09-27 09:29:59 +00:00
pramod.mahajan
265c74f079 added filter and sorted employee list - Team 2025-09-27 09:29:59 +00:00
pramod.mahajan
2ef1fcfd1d successfullly assigned employe to project 2025-09-27 09:29:59 +00:00
pramod.mahajan
3233043cf2 initial setup for assign emp to project 2025-09-27 09:29:59 +00:00
pramod.mahajan
3fddb686d3 change get employee at assign task to employee 2025-09-27 14:58:39 +05:30
pramod.mahajan
4fd6e5cc1a Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-27 10:33:40 +05:30
Kartik Sharma
1fb8eb9ef1 Create Task popup will open at all the time while submitting. 2025-09-26 16:21:37 +05:30
Kartik Sharma
1a3890e837 Removing Create and Activity from MasterModal.jsx file. 2025-09-26 15:34:08 +05:30
Kartik Sharma
2dbf08e330 Removing create and Edit activity component. 2025-09-26 15:02:03 +05:30
Kartik Sharma
b044b88c49 Adding border in Group and Activities popup and Removing mandatory field in Tenant. 2025-09-26 14:56:19 +05:30
Kartik Sharma
db815ba038 Rmoving Refresh icon and Label in Tenant. 2025-09-26 11:51:55 +05:30
pramod.mahajan
53fa013c39 split projectList component 2025-09-26 11:47:03 +05:30
Kartik Sharma
22a1ad45e7 Change the name of Switch Tenant to Workspace 2025-09-26 11:37:31 +05:30
Kartik Sharma
91dcd7c132 The images on the Forgot page and Request Demo page should be centered after the update. 2025-09-26 10:53:31 +05:30
pramod.mahajan
7d18edfa9b added tenant selection path within otp sign in way 2025-09-26 10:01:09 +05:30
pramod.mahajan
fb08e48edd added iniial state of daly progress filte panel 2025-09-25 19:30:55 +05:30
Kartik Sharma
69c225ac72 Adding Services dropdown in Organization Creation dropdown. 2025-09-25 16:09:36 +05:30
pramod.mahajan
182280e91d Merge pull request 'Correction of Delete Employee Popup Texts' (#424) from Kartik_Bug#1261 into Organization_Management 
Reviewed-on: #424
Mereged
 2025-09-25 09:21:54 +00:00
Kartik Sharma
38bd8d36c0 Correction of Delete Employee Popup Texts 2025-09-25 09:21:54 +00:00
pramod.mahajan
a4bccc9bf6 Merge pull request 'Verify mandatory indicator (*) for Reference field while creating a Tenant' (#427) from Kartik_Bug#1295 into Organization_Management 
Reviewed-on: #427
Merged
 2025-09-25 09:20:48 +00:00
Kartik Sharma
0e6dd93260 Verify mandatory indicator (*) for Reference field while creating a Tenant 2025-09-25 09:20:48 +00:00
pramod.mahajan
245219ad71 Merge pull request 'Inconsistent search bar height in Tenant module' (#429) from Kartik_Bug#1300 into Organization_Management 
Reviewed-on: #429
Merged
 2025-09-25 09:19:07 +00:00
Kartik Sharma
978a497f28 Inconsistent search bar height in Tenant module 2025-09-25 09:19:07 +00:00
pramod.mahajan
451d0a785f Merge pull request 'Change all create button UI.' (#430) from Kartik_Task#1345 into Organization_Management 
Reviewed-on: #430
Merged
 2025-09-25 09:17:56 +00:00
Kartik Sharma
84f9cb2e29 Change all create button UI. 2025-09-25 09:17:56 +00:00
pramod.mahajan
9d9ca28bad Merge pull request 'Incorrect button sequence in Tenant Edit form' (#428) from Kartik_Bug#1301 into Organization_Management 
Reviewed-on: #428
Merged
 2025-09-25 09:17:16 +00:00
Kartik Sharma
1d218056ac Incorrect button sequence in Tenant Edit form 2025-09-25 09:17:16 +00:00
pramod.mahajan
58837cef0c Merge pull request 'Adding Activity-Group in Create Task popup.' (#431) from Kartik_Task_InfraMask#1266 into Organization_Management 
Reviewed-on: #431
merged
 2025-09-25 09:00:46 +00:00
pramod.mahajan
1cd3bf6c7f updated assigned services poject whenver assigned new service 2025-09-25 09:00:46 +00:00
Kartik Sharma
d2b10495bd Added Services Column in Edit activity modal 2025-09-25 09:00:46 +00:00
Kartik Sharma
ae9c4833b3 Added Activity Group, and implemented sorting for Service, Activity Group, and Activities. 2025-09-25 09:00:46 +00:00
Kartik Sharma
e69efe61cb Adding Activity-Group in Create Task popup. 2025-09-25 09:00:46 +00:00
pramod.mahajan
92b1531b75 daily task planning filtering according to service 2025-09-25 14:11:04 +05:30
pramod.mahajan
57edd92dce fixed blocking of dailyprogress by using pagination 2025-09-25 12:36:55 +05:30
Kartik Sharma
49eaf857ad In Choose Orgainzation popup Find Organization and Search box show in one line. 2025-09-25 11:46:12 +05:30