2249 Commits

Author SHA1 Message Date
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
d52c4e6ec0 rename of menu item nane 2025-08-26 14:53:06 +05:30
7268971275 after form submit or failed form will be reset 2025-08-26 12:26:40 +05:30
1ad9b782a4 added lodering status when making request for demo 2025-08-26 12:24:56 +05:30
5dfaa6d44c render properly after login 2025-08-26 12:07:56 +05:30
4b988109f9 set image path at deployed state 2025-08-26 11:59:45 +05:30
83c2f7fb0c set legal-info page css 2025-08-26 11:41:07 +05:30
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
176801c014 fixed frquency range to 0 to 3 2025-08-25 14:54:22 +05:30
275d984ecc fixed cancel button on edit tenant form 2025-08-25 12:57:47 +05:30
ed1e0cd428 updated bill ans plan page 2025-08-25 12:46:48 +05:30
207c2820bf update Ui 2025-08-25 11:58:50 +05:30
fe87ebc859 added valiadtion for Team Size whenever going to upgrade or purchase plan 2025-08-25 11:30:42 +05:30
84837bbe45 removed bg color 2025-08-25 11:26:58 +05:30
3e2d601739 removed unused and added child id 2025-08-24 16:11:20 +05:30
2377a1b869 removed unused code 2025-08-24 16:10:25 +05:30
e1ecaf7a31 added default range set or not flag 2025-08-24 16:09:51 +05:30
33c8b690ef added dynamically master menu 2025-08-24 14:56:50 +05:30
75c81ecc0c added regular date formate and prevent to call api without param. 2025-08-24 14:26:32 +05:30
3fa6e19114 removed console 2025-08-24 13:11:00 +05:30
1aa6016a01 changed appmenu url 2025-08-23 17:55:39 +05:30
b00fc04a82 Merge pull request 'AppMenu : Dynamic Menus' (#356) from AppMenu into Tenant_Manag
Reviewed-on: #356
Merged
2025-08-23 11:57:43 +00:00
d1ff7321e9 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-23 17:25:50 +05:30
fc4715cdd8 Merge branch 'AppMenu' of https://git.marcoaiot.com/admin/marco.pms.web into AppMenu 2025-08-23 17:08:12 +05:30
50ec338d8a handle run time error 2025-08-23 17:06:38 +05:30
f00e3a1a24 initial setup sidebar menus from backend 2025-08-23 17:06:38 +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
a76cbe8615 handle error msg 2025-08-23 11:21:02 +05:30
006a68f2fe added new loader 2025-08-23 10:33:26 +05:30
49cf94546a changed position of autorenew input field 2025-08-23 10:23:05 +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