2026 Commits

Author SHA1 Message Date
ead8901d1e set logo position according screen size 2025-08-26 11:19:46 +05:30
8b2529013f fixed layout of registration page 2025-08-26 09:51:57 +05:30
bbd137a334 fixed login , forgot page 2025-08-25 20:31:53 +05:30
8b11bd952d Merge branch 'Landing_pages' of https://git.marcoaiot.com/admin/marco.pms.web into Landing_pages 2025-08-25 20:20:21 +05:30
d729054065 added public route page 2025-08-25 20:15:51 +05:30
585199a2a1 fixed layout properly of login , reset, forgot, login-with-otp and forgot -pages 2025-08-25 20:15:51 +05:30
ac0d17ca6d implement landing page UI 2025-08-25 20:15:26 +05:30
61fb797db4 change label 2025-08-25 20:14:48 +05:30
86187eaf8a changes in otp page. 2025-08-25 20:13:56 +05:30
67bf293bef add landing page 2025-08-25 20:13:56 +05:30
25945366d6 change the design of login page, otp page and request for demo page. 2025-08-25 20:13:33 +05:30
18390e9368 Merge pull request 'Issues_Aug_1W' (#355) from Issues_Aug_1W into main
Reviewed-on: #355
merged
2025-08-23 11:09:24 +00:00
380effd2f0 changed project source 2025-08-23 14:58:22 +05:30
a01e2deee7 Changes in Regularizationaction. 2025-08-23 13:19:41 +05:30
57eb2ab405 Changes in projectId for attendance, employee.
Dropdown of project has been hide in expense.
2025-08-23 12:55:35 +05:30
0cc65fdcfa Merge pull request 'Display Only "Re-activate" Button for Inactive Employees in Action Column' (#348) from Kartik_Bug#944 into Issues_Aug_1W
Reviewed-on: #348
Merged
2025-08-23 04:37:20 +00:00
f1bc6bd57d Updation in Employee Suspend and Reactivate employee. 2025-08-23 04:37:20 +00:00
00b73b3d34 Display Only "Re-activate" Button for Inactive Employees in Action Column 2025-08-23 04:37:20 +00:00
d542c26a17 Merge pull request 'Filter Popup from Expense Module Persists When Switching to Attendance Module' (#349) from Kartik_Bug#906 into Issues_Aug_1W
Reviewed-on: #349
Merged
2025-08-23 04:36:58 +00:00
6cbab5949c Filter Popup from Expense Module Persists When Switching to Attendance Module 2025-08-23 04:36:58 +00:00
6fe6d0ea40 Merge pull request 'Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning' (#350) from Kartik_Bug#920 into Issues_Aug_1W
Reviewed-on: #350
Merged
2025-08-23 04:36:31 +00:00
9f9bfbe922 Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning 2025-08-23 04:36:31 +00:00
52b0b9b2da Merge pull request 'Implementing a search functionality within the Attendance component to enable search across all tabs.' (#351) from Kartik_Enhancement#948 into Issues_Aug_1W
Reviewed-on: #351
Merged
2025-08-23 04:35:39 +00:00
9272783388 Implementing a search functionality within the Attendance component to enable search across all tabs. 2025-08-23 04:35:39 +00:00
fd5bd1966d Merge pull request 'Missing Employee Search Box in Assign Task Popup' (#352) from Kartik_Bug#915 into Issues_Aug_1W
Reviewed-on: #352
merged
2025-08-23 04:35:07 +00:00
1bf7ccbaad Missing Employee Search Box in Assign Task Popup 2025-08-20 16:28:15 +05:30
4349f19c30 Merge pull request 'Border line missing in multiple fields on Add New Employee form' (#344) from Kartik_Bug#932 into Issues_Aug_1W
Reviewed-on: #344
2025-08-18 11:08:37 +00:00
3bdd7218bb Merge pull request 'IN Create New Expense popup change the label TransactionId to Transaction ID.' (#343) from Kartik_Bug#895 into Issues_Aug_1W
Reviewed-on: #343
2025-08-18 11:07:29 +00:00
4a7fb67cd4 Merge pull request 'Inconsistent Filter Icon in Daily Progress Report section.' (#342) from Kartik_Bug#919 into Issues_Aug_1W
Reviewed-on: #342
2025-08-18 11:06:43 +00:00
30092e51bf Merge pull request 'Username & Password field should auto-trim spaces in Login page.' (#341) from Kartik_Bug#929 into Issues_Aug_1W
Reviewed-on: #341
2025-08-18 11:05:29 +00:00
db5c8fbe48 Merge pull request 'In Contact View, empty Description and Notes section should be hidden and its needs to be fixed the UI of this pop-up' (#340) from Kartik_Bug#886 into Issues_Aug_1W
Reviewed-on: #340
2025-08-18 11:03:53 +00:00
8c5c802f72 Merge pull request 'In AttendanceLog When we select a date range picker then api is not call after updation now its working properly.' (#346) from Kartik_Bug#907 into Issues_Aug_1W
Reviewed-on: #346
2025-08-18 11:02:25 +00:00
b45a4eb553 In AttendanceLog When we select a date range picker then api is not call after updation now its working properly. 2025-08-18 16:11:02 +05:30
2208cc66b1 Border line missing in multiple fields on Add New Employee form 2025-08-18 13:27:14 +05:30
6d504bf16b IN Create New Expense popup change the label TransactionId to Transaction ID. 2025-08-18 12:38:24 +05:30
9720206150 Inconsistent Filter Icon in Daily Progress Report section. 2025-08-18 12:07:05 +05:30
438ee4417f Username & Password field should auto-trim spaces in Login page. 2025-08-18 11:46:38 +05:30
2b5df10137 In Contact View, empty Description and Notes section should be hidden and its needs to be fixed the UI of this pop-up 2025-08-18 11:29:38 +05:30
7283140a3a Merge branch 'Issues_Aug_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_1W 2025-08-18 10:23:03 +05:30
d8f5485bec missing changes from PR : Add Search Bar in Assigned Employee Popup under Project > Teams #324
#324
2025-08-18 10:22:32 +05:30
967d176a09 change table header Official Designation to Designation 2025-08-18 10:22:32 +05:30
b97ac8e680 Special Characters Shoulsd not Allowed in Name Fields 2025-08-18 10:22:32 +05:30
745938a11f Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page 2025-08-18 10:22:32 +05:30
0bd8ed1035 UI Enhancement Request – Highlight Key Employee Profile Information 2025-08-18 10:22:31 +05:30
0722f52619 Deleted Employee Still Visible Until Manual Refresh. 2025-08-18 10:22:31 +05:30
ab7de32744 Removing extra space in list view. 2025-08-18 10:21:47 +05:30
9b0d19f961 Contact list grid columns not displayed when no contact is available 2025-08-18 10:21:46 +05:30
e62663af69 Change the icons on AttendanceChart.jsx 2025-08-18 10:20:08 +05:30
a602bebc5e implement landing page UI 2025-08-16 17:09:20 +05:30
1e9db47144 missing changes from PR : Add Search Bar in Assigned Employee Popup under Project > Teams #324
#324
2025-08-16 13:34:54 +05:30