2537 Commits

Author SHA1 Message Date
09bb58e50e fixed project level permission bug 2025-09-18 11:30:38 +05:30
01a5766074 organization created successfully 2025-09-18 10:01:39 +05:30
0348f6da8e fixed Modal provider component and setup organization creation 2025-09-17 19:45:42 +05:30
1c0e8655c4 Changes in Login-form hide/unhide button add secondary. 2025-09-17 17:09:56 +05:30
6211f52e3a Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Intefrating_API_Dashboard 2025-09-17 16:51:56 +05:30
df9107f0d8 Changes in UI of Subscription-plan. 2025-09-17 16:49:52 +05:30
eea7252b96 Changes in UI of Dashboard getplans. 2025-09-17 16:10:49 +05:30
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
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
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
d3218eb77a handle project set null at employee details page 2025-09-17 15:50:44 +05:30
4ad87af7f4 Add FAQ Answers on landing page 2025-09-17 15:22:25 +05:30
7b15309dbf Calling API for Dashboard paln show. 2025-09-17 14:38:57 +05:30
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
889b477dd0 removed subMenu of Project setting 2025-09-17 14:24:45 +05:30
19f8189fc3 resolved conflict during came rebase 2025-09-17 14:19:02 +05:30
970c195ca5 refactore SelectMult Tag for label display is required or optional 2025-09-17 14:15:29 +05:30
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
e0c7eee1fd removed unused files 2025-09-17 14:14:56 +05:30
6baa2896c2 initially setup 2025-09-17 14:14:56 +05:30
a835e75f66 fixed view project 2025-09-17 13:15:00 +05:30
cc7ef47055 fixed validation msg set bottom of select box 2025-09-17 12:54:40 +05:30
95fbac4760 fixed prevent removed existen permission whenever add new one 2025-09-17 12:41:00 +05:30
a86c815ca2 Asthetic Changes
- Margin on all sides for grid
- Margin for card content
2025-09-16 18:33:48 +05:30
daa1a29e8a added option chain for handle error 2025-09-16 18:11:47 +05:30
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
7d94c17c71 modified ui of header directory 2025-09-16 17:57:06 +05:30
fb6a8255c9 Changes in DocumentManager popup change the sequence. 2025-09-16 17:08:36 +05:30
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
0a489be675 added proper global and project level permission 2025-09-16 16:08:47 +05:30
c014d6c929 handle delete bucket 2025-09-16 12:07:42 +05:30
2c378745fa changed label class of directory filter 2025-09-16 10:59:25 +05:30
080d2307ca removed unused code 2025-09-16 10:49:44 +05:30
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
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
020020056e Changes in Activities DateRangePicket. 2025-09-15 18:19:11 +05:30
9b3ffdb33d changed input of search input text- search at Contact 2025-09-15 17:32:31 +05:30
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
e6e90c7d4e Filter dropdown in Assign Task popup does not close on outside click 2025-09-15 11:52:15 +00:00
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
7c2744058d Remove Extra Line Below "No Contact Found" Message in Directory 2025-09-15 11:51:46 +00:00
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
6bc8c65c81 Message should be inside card 2025-09-15 11:48:52 +00:00
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
e179a267aa Directory - Contacts Exported to Excel does not format properly 2025-09-15 11:47:56 +00:00
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
4927680fe3 fixed going wrong request for Expense payload - Transaction 2025-09-15 17:00:36 +05:30
9af7a5ceb2 Employee Profile Page Not Updating without refresh page ,After Edit 2025-09-15 15:19:40 +05:30
94eb283b2d added permission for managr task 2025-09-13 19:01:08 +05:30
0e3a634205 fixed permission add and remove updation 2025-09-13 18:16:56 +05:30