| 
						
					 | 
					
						
						
						
						
							
						
						
							7808a39aa0
							
						
					 | 
					
						
						
							
							prevent to view list of tenant if haven't permission.
						
						
						
						
						
						
					 | 
					
						2025-08-19 12:06:52 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b645aec55f
							
						
					 | 
					
						
						
							
							sorting plans history using date
						
						
						
						
						
						
					 | 
					
						2025-08-19 11:50:05 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							56e4c86c7f
							
						
					 | 
					
						
						
							
							handle empty field showing
						
						
						
						
						
						
					 | 
					
						2025-08-19 11:19:12 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5a90088a28
							
						
					 | 
					
						
						
							
							added tenant releated permission id's
						
						
						
						
						
						
					 | 
					
						2025-08-19 10:48:46 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e7a0d41278
							
						
					 | 
					
						
						
							
							restrict firstName and lastName fields to accept only alphabets
						
						
						
						
						
						
					 | 
					
						2025-08-19 10:11:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							00904ffa86
							
						
					 | 
					
						
						
							
							update contact number field to support valid and also international format
						
						
						
						
						
						
					 | 
					
						2025-08-19 09:54:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							19d7e35d8a
							
						
					 | 
					
						
						
							
							corrected spelling mistake in "Quarterly" plan type (Bills & Plan History
						
						
						
						
						
						
					 | 
					
						2025-08-18 23:38:07 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0a82e0af42
							
						
					 | 
					
						
						
							
							handle run time error
						
						
						
						
						
						
					 | 
					
						2025-08-18 23:27:52 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0df19cb78e
							
						
					 | 
					
						
						
							
							initial setup sidebar menus from backend
						
						
						
						
						
						
					 | 
					
						2025-08-18 18:21:16 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f25289f7fa
							
						
					 | 
					
						
						
							
							adde permission keys
						
						
						
						
						
						
					 | 
					
						2025-08-18 12:15:08 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dd0c7e95bf
							
						
					 | 
					
						
						
							
							change table header Official Designation to Designation
						
						
						
						
						
						
					 | 
					
						2025-08-16 12:59:07 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ee2c973d01
							
						
					 | 
					
						
						
							
							change label
						
						
						
						
						
						
					 | 
					
						2025-08-16 12:57:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a862500fd7
							
						
					 | 
					
						
						
							
							Merge pull request 'Special Characters Shoulsd not Allowed in Name Fields' (#339) from Kartik_Bug#910 into Issues_Aug_1W
						
						
						
						
						
						
						
						Reviewed-on: #339 
						
						
					 | 
					
						2025-08-16 07:09:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d5f6dbbfae
							
						
					 | 
					
						
						
							
							Merge pull request 'Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page' (#337) from Kartik_Bug#908 into Issues_Aug_1W
						
						
						
						
						
						
						
						Reviewed-on: #337 
						
						
					 | 
					
						2025-08-16 07:04:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3fdbae5cf5
							
						
					 | 
					
						
						
							
							Merge pull request 'UI Enhancement Request – Highlight Key Employee Profile Information' (#336) from Kartik_Bug#891 into Issues_Aug_1W
						
						
						
						
						
						
						
						Reviewed-on: #336 
						
						
					 | 
					
						2025-08-16 07:00:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1305ac855d
							
						
					 | 
					
						
						
							
							Merge branch 'Kartik_Bug#798' into Issues_Aug_1W
						
						
						
						
						
						
						
						# Conflicts:
#	src/hooks/useEmployees.js 
						
						
					 | 
					
						2025-08-16 12:27:21 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9366a131e6
							
						
					 | 
					
						
						
							
							handle subscription tab according to tenant existent
						
						
						
						
						
						
					 | 
					
						2025-08-16 12:23:10 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							30e9f49eb1
							
						
					 | 
					
						
						
							
							corrected Congratulation import path in TenantForm.jsx to match file name
						
						
						
						
						
						
					 | 
					
						2025-08-16 10:22:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							340919c6fb
							
						
					 | 
					
						
						
							
							corrected Profile import path in TenantDetails.jsx to match case-sensitive file name
						
						
						
						
						
						
					 | 
					
						2025-08-16 10:17:29 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a537da6eff
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag
						
						
						
						
						
						
					 | 
					
						2025-08-16 10:12:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							241217e7cc
							
						
					 | 
					
						
						
							
							changed folder name for Tenant
						
						
						
						
						
						
					 | 
					
						2025-08-16 10:11:19 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4af5ba8a6d
							
						
					 | 
					
						
						
							
							added upgraded subscription functionality
						
						
						
						
						
						
					 | 
					
						2025-08-16 09:43:11 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e300389e3
							
						
					 | 
					
						
						
							
							added table for history plans
						
						
						
						
						
						
					 | 
					
						2025-08-14 18:34:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0acd733710
							
						
					 | 
					
						
						
							
							handle upgrad plan
						
						
						
						
						
						
					 | 
					
						2025-08-14 17:45:01 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b9bd4e7e18
							
						
					 | 
					
						
						
							
							removed extra validation errors
						
						
						
						
						
						
					 | 
					
						2025-08-14 17:40:29 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							051fc3903d
							
						
					 | 
					
						
						
							
							Special Characters Shoulsd not Allowed in Name Fields
						
						
						
						
						
						
					 | 
					
						2025-08-14 13:42:10 +05:30 | 
					
					
						
						
							
							
							
						
					 |