2329 Commits

Author SHA1 Message Date
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
c83de16466 added missed outed confirm modal inside employee for suspend emp 2025-09-11 11:09:46 +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
aec6bd64ff Merge pull request 'Added Document Managment feature' (#388) from Document_Manag into main
Reviewed-on: #388
Merged
2025-09-10 14:34:35 +00:00
eea36a2722 handle delete master modal 2025-09-10 20:01:06 +05:30
1a7e77c814 structured code 2025-09-10 19:09:55 +05:30
b1a2250c48 imported missing routes during merged 2025-09-10 19:03:29 +05:30
f20c3a64f6 added proper modal size for Master Modal - Application Role 2025-09-10 19:00:07 +05:30
ebab03dc9f updated method for update contact category 2025-09-10 18:52:09 +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
691fd9208f fixed alignment address value at emplt about 2025-09-10 12:28:07 +05:30
45b21d3e73 restric open modal when came at admisitrator page 2025-09-10 11:33:44 +05:30
3db6cc2100 added modal, that was missing during merged 2025-09-10 11:29:01 +05:30
b934527cf5 added manually changed 2025-09-10 10:41:26 +05:30
bac62e1fa7 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
# Conflicts:
#	src/components/Employee/EmpOverview.jsx
2025-09-10 10:38:13 +05:30
5ec5218dd6 Merge branch 'Issues_Sep_1W' into Document_Manag
# Conflicts:
#	src/pages/Activities/DailyTask.jsx
#	src/pages/master/MasterPage.jsx
2025-09-10 10:37:38 +05:30
47d0e332f1 add blog container 2025-09-10 10:35:36 +05:30