Refactor_Directory And Project Level Permsssion #404

Merged
pramod.mahajan merged 90 commits from Refactor_Directory into main 2025-09-17 10:24:46 +00:00

90 Commits

Author SHA1 Message Date
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
889b477dd0 removed subMenu of Project setting 2025-09-17 14:24:45 +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
2ef56e7f83 added correct msg for contact person 2025-09-13 16:10:17 +05:30
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
70110192f4 Remove Required Indicator from Tags Field in Document Upload 2025-09-13 10:13:18 +00:00
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
75ca3d1504 Display Only "Re-activate" Button for Inactive Employees in Action Column 2025-09-13 10:11:25 +00:00
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
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
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
2f2ddb0576 Standardize All Buttons in Expenses Module to Match Website-Wide Button Style 2025-09-13 10:06:14 +00:00
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
84500f6913 Forgot Password – Reset link not sent, error shown for all valid emails 2025-09-13 10:05:34 +00:00
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
8c48b83581 Password Field UI Not Proper – White Background Not Covering Full Field 2025-09-13 10:04:39 +00:00
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
d1098e64a7 Username and Password Fields Should Auto-Trim Spaces on Login 2025-09-13 10:03:31 +00:00
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
9de1613bd9 New Password Field on Reset Password Page Should Be Empty 2025-09-13 10:02:45 +00:00
9676d45710 When the clear button hit api for full response. 2025-09-12 17:16:34 +05:30
7e5b6952f5 Apply functionality for Both Notes and Contact filter 2025-09-12 17:09:48 +05:30
0484de498c Changes in UI of Directory Notes Tabs and all the popups. 2025-09-12 16:11:31 +05:30
a7ccaa2812 changed position of text- Active and In-Active 2025-09-12 13:08:07 +05:30
5fb7e89cb2 changed sequence of contact form buttons 2025-09-12 12:58:01 +05:30
2027bd3d17 all images path changed 2025-09-12 12:37:31 +05:30
ee9698f665 changed images path for landing page 2025-09-12 12:29:54 +05:30
25ec5a354c changed path of logo 2025-09-12 12:21:40 +05:30
8335c42935 added direct bucket permission 2025-09-12 12:04:24 +05:30
3963002a2d Merge branch 'landing_page_1' into Refactor_Directory
# Conflicts:
#	src/pages/Home/LandingPage.css
2025-09-11 18:14:31 +05:30
717264c9f9 fixed update and creation for contacts 2025-09-11 17:34:56 +05:30
1a04dd51fc Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-11 16:25:49 +05:30
b51b3db9ec added missing assset 2025-09-11 10:51:46 +05:30
79553cab4e Merge pull request 'Added new page - Landing Page' (#390) from landing_page_1 into Refactor_Directory
Reviewed-on: #390
Merged
2025-09-11 05:01:19 +00:00
7a74084841 rearrange images in folder 2025-09-11 05:01:19 +00:00
7638f8bdaa Add blog content 2025-09-11 05:01:19 +00:00
78f304a490 add blog container 2025-09-11 05:01:19 +00:00
0b38436dfe handle animations 2025-09-11 05:01:19 +00:00
15581f3f26 landing page modifications 2025-09-11 05:01:19 +00:00
8dc064340b removed unused component 2025-09-10 21:01:28 +05:30
285b853026 removed alreday declare component 2025-09-10 20:39:48 +05:30
81e5456e1d Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-10 20:36:54 +05:30
4741025dcb set Directory page for project 2025-09-10 20:35:48 +05:30
d6de8cbfc1 completely refactored directory module 2025-09-10 18:13:36 +05:30
44cc6c6e81 rearrange images in folder 2025-09-10 13:44:50 +05:30
6604a4db13 Add blog content 2025-09-10 12:49:30 +05:30
b66106c301 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory 2025-09-10 12:46:38 +05:30
47d0e332f1 add blog container 2025-09-10 10:35:36 +05:30
e454917763 refactored notes list 2025-09-10 02:41:59 +05:30
b113675cc2 contact Active and InActive refactored 2025-09-10 00:07:34 +05:30
025b13ea64 reafctor contact list with filter 2025-09-09 20:04:48 +05:30
2642532b60 handle animations 2025-09-09 15:02:59 +05:30
b91487712d initially contactfilter added 2025-09-09 12:09:03 +05:30
6ca6ec31f7 landing page modifications 2025-09-09 12:06:10 +05:30
1abed1de3a managebucket component is split 2025-09-09 01:49:31 +05:30
957f790fce initially created ManageBucket 2025-09-08 11:40:03 +05:30
6a472b39ef initialli refactoring directory 2025-09-08 10:14:18 +05:30