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

2580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pramod.mahajan
442ecff926 Merge pull request 'Refactor_Directory And Project Level Permsssion' (#404) from Refactor_Directory into main 
Reviewed-on: #404
Merged
 2025-09-17 10:24:45 +00:00
pramod.mahajan
0abd77dab7 Merge pull request 'Calling API for Dashboard paln show.' (#405) from Intefrating_API_Dashboard into Refactor_Directory 
Reviewed-on: #405
Merged
 2025-09-17 10:23:13 +00:00
pramod mahajan
4b0ea3a0db Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-17 15:50:49 +05:30
pramod mahajan
d3218eb77a handle project set null at employee details page 2025-09-17 15:50:44 +05:30
Vikas Nale
4ad87af7f4 Add FAQ Answers on landing page 2025-09-17 15:22:25 +05:30
Kartik Sharma
7b15309dbf Calling API for Dashboard paln show. 2025-09-17 14:38:57 +05:30
pramod mahajan
834ce62e67 Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-17 14:26:35 +05:30
pramod mahajan
889b477dd0 removed subMenu of Project setting 2025-09-17 14:24:45 +05:30
pramod mahajan
19f8189fc3 resolved conflict during came rebase 2025-09-17 14:19:02 +05:30
pramod mahajan
970c195ca5 refactore SelectMult Tag for label display is required or optional 2025-09-17 14:15:29 +05:30
pramod mahajan
d944d3a389 setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-17 14:15:29 +05:30
pramod mahajan
e0c7eee1fd removed unused files 2025-09-17 14:14:56 +05:30
pramod mahajan
6baa2896c2 initially setup 2025-09-17 14:14:56 +05:30
pramod mahajan
a835e75f66 fixed view project 2025-09-17 13:15:00 +05:30
pramod mahajan
cc7ef47055 fixed validation msg set bottom of select box 2025-09-17 12:54:40 +05:30
pramod mahajan
95fbac4760 fixed prevent removed existen permission whenever add new one 2025-09-17 12:41:00 +05:30
Vikas Nale
a86c815ca2 Asthetic Changes 
- Margin on all sides for grid
- Margin for card content
 2025-09-16 18:33:48 +05:30
pramod mahajan
daa1a29e8a added option chain for handle error 2025-09-16 18:11:47 +05:30
pramod mahajan
794429821b Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-16 17:57:11 +05:30
pramod mahajan
7d94c17c71 modified ui of header directory 2025-09-16 17:57:06 +05:30
Kartik Sharma
fb6a8255c9 Changes in DocumentManager popup change the sequence. 2025-09-16 17:08:36 +05:30
pramod.mahajan
7ef10e3e5b Merge pull request 'Handled Global and Project level permissions' (#403) from hotchanges_projectPermission into Refactor_Directory 
Reviewed-on: #403
Merged
 2025-09-16 10:43:30 +00:00
pramod mahajan
0a489be675 added proper global and project level permission 2025-09-16 16:08:47 +05:30
pramod mahajan
c014d6c929 handle delete bucket 2025-09-16 12:07:42 +05:30
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