| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							841ffdf133
							
						
					 | 
					
						
						
							
							Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page
						
						
						
						
						
						
					 | 
					
						2025-08-14 12:46:14 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cbfce2e4e2
							
						
					 | 
					
						
						
							
							UI Enhancement Request – Highlight Key Employee Profile Information
						
						
						
						
						
						
					 | 
					
						2025-08-14 11:10:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9669e725a4
							
						
					 | 
					
						
						
							
							Merge branch 'Issues_Aug_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_1W
						
						
						
						
						
						
					 | 
					
						2025-08-14 10:14:04 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8df47c1530
							
						
					 | 
					
						
						
							
							In Masters cancel button now cancel or close the form as excepted.
						
						
						
						
						
						
					 | 
					
						2025-08-14 10:13:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef06c69a3b
							
						
					 | 
					
						
						
							
							When the data is not loaded then the filter show "No Filter found" message.
						
						
						
						
						
						
					 | 
					
						2025-08-14 10:13:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5940f86815
							
						
					 | 
					
						
						
							
							Show Single "No Bucket Found" Message and Improve Popup Design
						
						
						
						
						
						
					 | 
					
						2025-08-14 10:13:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cae6d52a33
							
						
					 | 
					
						
						
							
							Removing extra space in list view.
						
						
						
						
						
						
					 | 
					
						2025-08-14 10:13:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ad9295a6b3
							
						
					 | 
					
						
						
							
							Contact list grid columns not displayed when no contact is available
						
						
						
						
						
						
					 | 
					
						2025-08-14 10:13:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af69f3f97b
							
						
					 | 
					
						
						
							
							Font size and button styling mismatch in Contact Profile (Web Directory)
						
						
						
						
						
						
					 | 
					
						2025-08-14 10:13:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							31f152db65
							
						
					 | 
					
						
						
							
							added updated functionality
						
						
						
						
						
						
					 | 
					
						2025-08-13 17:09:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1772a2fcd1
							
						
					 | 
					
						
						
							
							Merge pull request 'profile_page : Modify Employee Profile Page' (#335) from profile_page into main
						
						
						
						
						
						
						
						Reviewed-on: #335
merged 
						
						
					 | 
					
						2025-08-13 04:44:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af544861d2
							
						
					 | 
					
						
						
							
							Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page
						
						
						
						
						
						
					 | 
					
						2025-08-13 10:13:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f387a56d7b
							
						
					 | 
					
						
						
							
							optimized  EmpDashBoard , EmployeeNav and EmployeeProfile
						
						
						
						
						
						
					 | 
					
						2025-08-13 10:13:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e12528e3a
							
						
					 | 
					
						
						
							
							Add api to fetch employee project allocation
						
						
						
						
						
						
					 | 
					
						2025-08-13 10:03:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							874f123d4c
							
						
					 | 
					
						
						
							
							Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page
						
						
						
						
						
						
					 | 
					
						2025-08-12 17:48:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							926594c0a5
							
						
					 | 
					
						
						
							
							optimized  EmpDashBoard , EmployeeNav and EmployeeProfile
						
						
						
						
						
						
					 | 
					
						2025-08-12 17:48:36 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb2dcf073c
							
						
					 | 
					
						
						
							
							Add api to fetch employee project allocation
						
						
						
						
						
						
					 | 
					
						2025-08-12 17:44:04 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f946c38aae
							
						
					 | 
					
						
						
							
							Created new layout for employee profile page
						
						
						
						
						
						
					 | 
					
						2025-08-12 17:39:09 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c211f407e8
							
						
					 | 
					
						
						
							
							Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:27:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8117e60bff
							
						
					 | 
					
						
						
							
							optimized  EmpDashBoard , EmployeeNav and EmployeeProfile
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:27:26 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							80ede060cb
							
						
					 | 
					
						
						
							
							fixed column size base dvice size
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:27:26 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e39a69ab8b
							
						
					 | 
					
						
						
							
							handle error due to data loading
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:27:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fa3ff291c8
							
						
					 | 
					
						
						
							
							display employee tasks in emp profile
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:27:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							beefe6396c
							
						
					 | 
					
						
						
							
							- Add date format hook
						
						
						
						
						
						
						
						- add Ui for Activities 
						
						
					 | 
					
						2025-08-12 16:27:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							210d16c765
							
						
					 | 
					
						
						
							
							Handle null variable
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cb23a5b051
							
						
					 | 
					
						
						
							
							Add api to fetch employee project allocation
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f52b68dc46
							
						
					 | 
					
						
						
							
							ui improvements - dashbord attendance report toggle icons change
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ab013c29f0
							
						
					 | 
					
						
						
							
							change favicon
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c350574171
							
						
					 | 
					
						
						
							
							- Add project list on emplyee profile
						
						
						
						
						
						
						
						- Add image as per gender 
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							90d8b82c69
							
						
					 | 
					
						
						
							
							- Remove consoe log
						
						
						
						
						
						
						
						- Handle projects dropdown hidden on profile page 
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c0a6d8a89
							
						
					 | 
					
						
						
							
							Created new layout for employee profile page
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							16f70067e7
							
						
					 | 
					
						
						
							
							optimized  EmpDashBoard , EmployeeNav and EmployeeProfile
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:22:34 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bda0fe636e
							
						
					 | 
					
						
						
							
							Merge pull request 'In Masters cancel button now cancel or close the form as excepted.' (#327) from Kartik_Bug#869 into Issues_Aug_1W
						
						
						
						
						
						
						
						Reviewed-on: #327
Merged 
						
						
					 | 
					
						2025-08-12 09:43:53 +00:00 | 
					
					
						
						
							
							
							
						
					 |