admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
2,132 Commits 240 Branches 0 Tags
Commit Graph

2132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pramod mahajan
04df99634c Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Landing_pages 2025-09-10 18:16:17 +05:30
Vikas Nale
698c1b7b16 add new images 
replase class= with className=
 2025-09-08 12:32:16 +05:30
pramod.mahajan
42b6802419 Merge pull request 'Issues_Aug_2W' (#371) from Issues_Aug_2W into main 
Reviewed-on: #371
Merged
 2025-09-05 05:45:32 +00:00
pramod mahajan
cabb1b01c9 don't changed project when move to one page to another page 2025-09-05 11:14:02 +05:30
pramod mahajan
6dfdaf3316 changed name useSelectedproject to useSelectedProject 2025-09-05 11:06:38 +05:30
pramod mahajan
4369705a2d Merge branch 'Issues_Aug_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_2W 2025-09-05 10:53:35 +05:30
pramod mahajan
34654aae0a : rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject 2025-09-05 10:53:05 +05:30
pramod.mahajan
f96a363a57 Merge pull request 'Notes in Project Directory showing global notes instead of project-specific contact notes.' (#358) from Kartik_Bug#974 into Issues_Aug_2W 
Reviewed-on: #358
 2025-09-01 09:29:07 +00:00
Kartik Sharma
e81a97cd52 Notes in Project Directory showing global notes instead of project-specific contact notes. 2025-09-01 09:29:07 +00:00
pramod.mahajan
f97c75dde7 Merge pull request 'When the employee is in an inactive state, the Edit button will be disabled.' (#359) from Kartik_Bug#972 into Issues_Aug_2W 
Reviewed-on: #359
Merged
 2025-09-01 09:27:54 +00:00
Kartik Sharma
d25c51db58 When the employee is in an inactive state, the Edit button will be disabled. 2025-09-01 09:27:54 +00:00
pramod.mahajan
29c5d38bef Merge pull request 'Employee Module – Unnecessary space between contact icons and contact number' (#360) from Kartik_Bug#956 into Issues_Aug_2W 
Reviewed-on: #360
Merged
 2025-09-01 09:26:21 +00:00
Kartik Sharma
b62cbd1a75 Employee Module – Unnecessary space between contact icons and contact number 2025-09-01 09:26:21 +00:00
pramod.mahajan
b1f6306f23 Merge pull request 'Office Number, Domain Name, and Tax ID fields should be nullable but are mandatory.' (#361) from Kartik_Bug#978 into Issues_Aug_2W 
Reviewed-on: #361
Merged
 2025-09-01 09:25:20 +00:00
Kartik Sharma
3c9dd1595a Office Number, Domain Name, and Tax ID fields should be nullable but are mandatory. 2025-09-01 09:25:20 +00:00
pramod.mahajan
d9456db01e Merge pull request 'Cancel button not closing All fields popup in masters' (#362) from Kartik_Bug#979 into Issues_Aug_2W 
Reviewed-on: #362
Merged
 2025-09-01 09:23:29 +00:00
Kartik Sharma
79e23fef24 The bottom border of the Master dropdown is not visible. 2025-09-01 09:23:29 +00:00
Kartik Sharma
f569ed635c Cancel button not closing All fields popup in masters 2025-09-01 09:23:29 +00:00
pramod.mahajan
dca4691032 Merge pull request 'The calendar icon should display correctly when we increase the zoom.' (#363) from Kartik_Bug#973 into Issues_Aug_2W 
Reviewed-on: #363
Merged
 2025-09-01 09:22:42 +00:00
Kartik Sharma
fa878642b6 The calendar icon should display correctly when we increase the zoom. 2025-09-01 09:22:42 +00:00
pramod.mahajan
a1c3af9073 Merge pull request 'Attendance Record Popup Shows Wrong Date Format' (#364) from Kartik_Bug#1024 into Issues_Aug_2W 
Reviewed-on: #364
Merged
 2025-09-01 09:19:03 +00:00
Kartik Sharma
f433e55a96 Changes in date format in Attendance logs and attendance. 2025-09-01 09:19:03 +00:00
Kartik Sharma
833a54e57a Attendance Record Popup Shows Wrong Date Format 2025-09-01 09:19:03 +00:00
pramod.mahajan
8bce930028 Merge pull request 'Expense Module – Default date range filter hides all records on page load' (#365) from Kartik_Bug#955 into Issues_Aug_2W 
Reviewed-on: #365
Merged
 2025-09-01 09:11:17 +00:00
Kartik Sharma
047d0241bd Expense Module – Default date range filter hides all records on page load 2025-09-01 09:11:17 +00:00
pramod.mahajan
e71debe932 Merge pull request 'The Tenant filter does not close when navigating to another component.' (#366) from Kartik_Bug#1028 into Issues_Aug_2W 
Reviewed-on: #366
Merged
 2025-09-01 09:10:38 +00:00
Kartik Sharma
1a77cc809a The Tenant filter does not close when navigating to another component. 2025-09-01 09:10:38 +00:00
pramod.mahajan
73c6ccc0d6 Merge pull request 'Filter Applied Without Clicking on "Apply" Button in Daily Progress Report' (#367) from Kartik_Bug#1037 into Issues_Aug_2W 
Reviewed-on: #367
Merged
 2025-09-01 08:56:20 +00:00
Kartik Sharma
fc5f47536f Filter Applied Without Clicking on "Apply" Button in Daily Progress Report 2025-09-01 08:56:20 +00:00
pramod.mahajan
aaa97532a4 Merge pull request 'Pagination Displayed Even When Records Are greater Than 20' (#368) from Kartik_Bug#1041 into Issues_Aug_2W 
Reviewed-on: #368
Merged
 2025-09-01 06:46:37 +00:00
Kartik Sharma
f847e5f07f Remove hardcoded 20 and add ITEMS_PER_PAGE 2025-09-01 12:11:55 +05:30
Kartik Sharma
8c465db8d4 Pagination Displayed Even When Records Are greater Than 20 2025-09-01 10:49:40 +05:30
pramod mahajan
386b61d978 fixed overridding of backgound color of app 2025-08-28 12:01:47 +05:30
pramod.mahajan
9dddba4e30 Merge pull request 'Tenant_Manag : Feature #901 : Tenant Management' (#334) from Tenant_Manag into main 
Reviewed-on: #334
Merged
 2025-08-26 10:05:29 +00:00
pramod mahajan
d52c4e6ec0 rename of menu item nane 2025-08-26 14:53:06 +05:30
pramod mahajan
7268971275 after form submit or failed form will be reset 2025-08-26 12:26:40 +05:30
pramod mahajan
1ad9b782a4 added lodering status when making request for demo 2025-08-26 12:24:56 +05:30
pramod mahajan
5dfaa6d44c render properly after login 2025-08-26 12:07:56 +05:30
pramod mahajan
4b988109f9 set image path at deployed state 2025-08-26 11:59:45 +05:30
pramod mahajan
83c2f7fb0c set legal-info page css 2025-08-26 11:41:07 +05:30
pramod mahajan
ead8901d1e set logo position according screen size 2025-08-26 11:19:46 +05:30
pramod mahajan
8b2529013f fixed layout of registration page 2025-08-26 09:51:57 +05:30
pramod mahajan
bbd137a334 fixed login , forgot page 2025-08-25 20:31:53 +05:30
pramod mahajan
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
pramod mahajan
d729054065 added public route page 2025-08-25 20:15:51 +05:30
pramod mahajan
585199a2a1 fixed layout properly of login , reset, forgot, login-with-otp and forgot -pages 2025-08-25 20:15:51 +05:30
Vikas Nale
ac0d17ca6d implement landing page UI 2025-08-25 20:15:26 +05:30
Vikas Nale
61fb797db4 change label 2025-08-25 20:14:48 +05:30
Kartik Sharma
86187eaf8a changes in otp page. 2025-08-25 20:13:56 +05:30
Vikas Nale
67bf293bef add landing page 2025-08-25 20:13:56 +05:30