1853 Commits

Author SHA1 Message Date
ee2c973d01 change label 2025-08-16 12:57:47 +05:30
4d66ebeb50 changes in otp page. 2025-08-05 11:48:10 +05:30
38332c0a0d add landing page 2025-08-04 19:08:24 +05:30
7ad65ece78 Merge pull request 'change the design of login page, otp page and request for demo page.' (#323) from Kartik_Task857 into Landing_pages
Reviewed-on: #323
2025-08-04 11:57:07 +00:00
34cf3a0913 change the design of login page, otp page and request for demo page. 2025-08-04 14:37:34 +05:30
74f532799a Merge pull request 'Issues_July_4W' (#316) from Issues_July_4W into main
Reviewed-on: #316
THis branch is deployed on prodution
2025-07-31 05:53:28 +00:00
b0e359e428 Change in Team and InfraStructure component when select a project. 2025-07-30 17:32:49 +05:30
b410ec71cc All Projects is shown on Unknown Projects Place. 2025-07-30 16:36:30 +05:30
c3835a3856 Some changes in Header and aboutproject component. 2025-07-30 15:34:04 +05:30
811392448d Merge pull request 'When a project is selected, the last selected project will be displayed.' (#313) from Kartik_Task_#832_ProjectSelection into Issues_July_4W
Reviewed-on: #313
merged
2025-07-30 09:26:35 +00:00
5399fa1f17 When a project is selected, the last selected project will be displayed. 2025-07-30 14:39:43 +05:30
4512c11a60 Merge pull request 'Modify Application role popup to look better' (#309) from Kartik_Bug#793 into Issues_July_4W
Reviewed-on: #309
Merged
2025-07-30 09:04:05 +00:00
14be5aadda UI Changes in Aboutproject.jsx. 2025-07-30 09:04:05 +00:00
fa3ccd28fa Responsive grid changes in Create Role and EditRole. 2025-07-30 09:04:05 +00:00
4d4037ed71 Changes in Application Role popup. 2025-07-30 09:04:05 +00:00
91fabf929c Modify Application role popup to look better 2025-07-30 09:04:05 +00:00
95bfacf5f1 Merge pull request 'Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project.' (#306) from Kartik_Bug#797 into Issues_July_4W
Reviewed-on: #306
Merged
2025-07-30 07:54:06 +00:00
76e290fe79 Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project. 2025-07-30 07:54:06 +00:00
a1682c8a62 Merge pull request 'In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids.' (#307) from Kartik_Enhancement#807 into Issues_July_4W
Reviewed-on: #307
Merged
2025-07-29 13:44:47 +00:00
ac8815d674 In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids. 2025-07-29 13:44:47 +00:00
697c9acfa6 Merge pull request 'Date Format Not Consistent – Should Always Display DD‑MM‑YYYY' (#308) from Kartik_Bug#717 into Issues_July_4W
Reviewed-on: #308
Merged
2025-07-29 13:33:08 +00:00
a763ec4412 Date Format Not Consistent – Should Always Display DD‑MM‑YYYY 2025-07-29 13:33:08 +00:00
cc05dbad20 In Contact profile popup Include Delete functionality add. 2025-07-29 16:23:19 +05:30
528d02a703 Changes in Directory card view design. 2025-07-28 13:21:20 +05:30
66f2d4bff6 In Project List page change Filter icon. 2025-07-28 13:10:55 +05:30
ffb1bd742a Merge pull request 'Project List Dropdown will be remove in Projects.' (#302) from Kartik_ProjectList#628 into Issues_July_4W
Reviewed-on: #302
Merged
2025-07-28 06:02:02 +00:00
f28a1a9d4e Project List Dropdown will be remove in Projects. 2025-07-28 06:02:02 +00:00
8b2aef8a52 All the changes of Search functionality in Attendance page. 2025-07-28 11:21:37 +05:30
254aaf1977 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 16:55:11 +05:30
bb224ea3e7 Change all filter icon in Directory ,imageGallery and Project List. 2025-07-26 16:50:24 +05:30
536f4d4e3a Directory Implementation in Contact profile popup. 2025-07-26 16:50:24 +05:30
d7986e4af4 Changes in during a merge 2025-07-26 16:50:24 +05:30
527e052786 changes 2025-07-26 16:43:51 +05:30
52ef65cce0 Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 2025-07-26 16:43:28 +05:30
32434da93f Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:42:26 +05:30
276a2ca9f4 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:39:42 +05:30
aa43dd4540 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 16:39:16 +05:30
a001875a56 UI changes in Employee Profile and Project Profile. 2025-07-26 16:39:16 +05:30
f565e83413 Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-26 16:38:38 +05:30
55625246ce Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-26 16:38:38 +05:30
9f1b8f7090 revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
2025-07-26 16:38:38 +05:30
c35b7954fc When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-26 16:38:38 +05:30
3848130cde Chnages in Header.js wihile user is assigned to single project. 2025-07-26 16:38:38 +05:30
74c2906527 Removing Console.log. 2025-07-26 16:38:38 +05:30
7535028b44 Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 2025-07-26 16:38:37 +05:30
3925926084 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-26 16:37:52 +05:30
3709346d42 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 16:35:43 +05:30
eec208db89 Merge pull request 'Change all filter icon in Directory ,imageGallery and Project List.' (#301) from Kartik_Filter_Changes#800 into Issues_July_4W
Reviewed-on: #301
merged
2025-07-26 09:37:03 +00:00
0357596ea3 Change all filter icon in Directory ,imageGallery and Project List. 2025-07-26 09:37:03 +00:00
53628f0bf0 Merge pull request 'Directory Implementation in Contact profile popup.' (#300) from Kartik_Directory_Changes#805 into Issues_July_4W
Reviewed-on: #300
Merged
2025-07-26 09:24:29 +00:00