| 
						
					 | 
					
						
						
						
						
							
						
						
							4345c55247
							
						
					 | 
					
						
						
							
							In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come.
						
						
						
						
						
						
					 | 
					
						2025-06-04 17:11:55 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							176535f53f
							
						
					 | 
					
						
						
							
							Added Column Today's Planned to Project Infrastructure
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:59:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3486a6bc3a
							
						
					 | 
					
						
						
							
							In Teams Tab when we Assign a project then this dropdown not change its state .
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:56:04 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cf8a67bc2c
							
						
					 | 
					
						
						
							
							Adding a error message on InActive selection on Teams tab on Projects.
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:54:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							18d848b697
							
						
					 | 
					
						
						
							
							Merge pull request 'In Report popup when we take value = 0 then giv error but now it is resolved.' (#179) from Kartik_Bug#436 into Issue_Jun_1W
						
						
						
						
						
						
						
						Reviewed-on: #179 
						
						
					 | 
					
						2025-06-03 11:53:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5df397488a
							
						
					 | 
					
						
						
							
							In Employee Management when we select Project then this toggle button will be disabled.
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:52:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2b015947ef
							
						
					 | 
					
						
						
							
							Merge pull request 'pramod_Bug-#433 :Show "No Contact Found" Message When Directory Is Empty' (#177) from pramod_Bug-#433 into Feature_Directory
						
						
						
						
						
						
						
						Reviewed-on: #177 
						
						
					 | 
					
						2025-06-03 11:50:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b5aa5fb1a
							
						
					 | 
					
						
						
							
							enable contact name click to open contact profile
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:49:41 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e83eafddd2
							
						
					 | 
					
						
						
							
							added editcontact tag form inside master modal
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:48:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bd050f919
							
						
					 | 
					
						
						
							
							correct delete contact tag url
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:48:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							493689fb1a
							
						
					 | 
					
						
						
							
							Add progress bar for work area on Infra Page
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:47:18 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							80d3434bbf
							
						
					 | 
					
						
						
							
							Display completion percentage for each Work Area header
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:47:18 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b697943787
							
						
					 | 
					
						
						
							
							In Report popup when we take value = 0 then giv error but now it is resolved.
						
						
						
						
						
						
					 | 
					
						2025-06-03 11:11:00 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							1298994f58
							
						
					 | 
					
						
						
							
							enhance UX for loading and empty states in contact table
						
						
						
						
						
						
					 | 
					
						2025-06-03 00:12:39 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							f92ef4e52a
							
						
					 | 
					
						
						
							
							enhance UX for loading and empty states in contact table
						
						
						
						
						
						
					 | 
					
						2025-06-03 00:09:33 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							34c04f31ec
							
						
					 | 
					
						
						
							
							Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory
						
						
						
						
						
						
					 | 
					
						2025-06-02 23:42:00 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7e05cfbd61
							
						
					 | 
					
						
						
							
							In Employee selection double Date is shown in Front.
						
						
						
						
						
						
					 | 
					
						2025-06-02 17:31:07 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d649fbc78
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory
						
						
						
						
						
						
					 | 
					
						2025-06-02 17:13:01 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							0843123505
							
						
					 | 
					
						
						
							
							handled error , if does'nt have category
						
						
						
						
						
						
					 | 
					
						2025-06-02 07:55:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c46bffc4b
							
						
					 | 
					
						
						
							
							show "NA" for missing email in contact list view
						
						
						
						
						
						
					 | 
					
						2025-06-02 07:55:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da6b56ac8c
							
						
					 | 
					
						
						
							
							Merge pull request 'show "NA" in phone number columns when contact is created without a phone number' (#170) from pramod_Bug-#385 into Feature_Directory
						
						
						
						
						
						
						
						Reviewed-on: #170 
						
						
					 | 
					
						2025-06-02 07:54:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							426a885629
							
						
					 | 
					
						
						
							
							show "NA" in phone number columns when contact is created without a phone number
						
						
						
						
						
						
					 | 
					
						2025-06-02 11:28:34 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e03d1b4e99
							
						
					 | 
					
						
						
							
							recall usebucket hook after delete and create contact.
						
						
						
						
						
						
					 | 
					
						2025-06-02 10:29:42 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c91682a871
							
						
					 | 
					
						
						
							
							fixed attendance status & logs logic with proper activity handling
						
						
						
						
						
						
					 | 
					
						2025-05-31 23:34:55 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd9a02430e
							
						
					 | 
					
						
						
							
							Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#215
						
						
						
						
						
						
					 | 
					
						2025-05-31 19:45:08 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							628bf006d6
							
						
					 | 
					
						
						
							
							conditionally render Actions column based on permissions and project status
						
						
						
						
						
						
					 | 
					
						2025-05-31 17:02:36 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							936636c29b
							
						
					 | 
					
						
						
							
							optimized custom hook usage
						
						
						
						
						
						
					 | 
					
						2025-05-31 10:17:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							d10d47e642
							
						
					 | 
					
						
						
							
							added title name for assign employee modal
						
						
						
						
						
						
					 | 
					
						2025-05-31 10:17:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							14b851b87e
							
						
					 | 
					
						
						
							
							added  modal name- Assign Employee
						
						
						
						
						
						
					 | 
					
						2025-05-31 10:17:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf9f09d5b4
							
						
					 | 
					
						
						
							
							Merge branch 'Issue_May_5W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_5W
						
						
						
						
						
						
					 | 
					
						2025-05-31 15:37:05 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f72c309c0c
							
						
					 | 
					
						
						
							
							Comment code in Dashboard.
						
						
						
						
						
						
					 | 
					
						2025-05-31 15:35:36 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ccbe89f407
							
						
					 | 
					
						
						
							
							Cosmatic changes for Attendance Widget
						
						
						
						
						
						
					 | 
					
						2025-05-31 15:30:41 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							383162c4c3
							
						
					 | 
					
						
						
							
							Merge branch 'Kartik_Task#414' into Issue_May_5W
						
						
						
						
						
						
						
						# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
#	src/hooks/useDashboard_Data.jsx
#	src/repositories/GlobalRepository.jsx 
						
						
					 | 
					
						2025-05-31 13:49:01 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							084454112a
							
						
					 | 
					
						
						
							
							Merge branch 'Kartik_Task#400' into Issue_May_5W
						
						
						
						
						
						
						
						# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
#	src/hooks/useDashboard_Data.jsx 
						
						
					 | 
					
						2025-05-31 13:41:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d80082bc9b
							
						
					 | 
					
						
						
							
							Status code 400 showing on Logs tab and Daily Progress Report datepicker issue.
						
						
						
						
						
						
					 | 
					
						2025-05-31 08:09:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f511292f5a
							
						
					 | 
					
						
						
							
							Merge pull request 'Adding new Weidget in Dashboadr name is "Pending Attendance".' (#156) from Kartik_Task#342 into Issue_May_5W
						
						
						
						
						
						
						
						Reviewed-on: #156 
						
						
					 | 
					
						2025-05-31 08:08:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6819bfbb52
							
						
					 | 
					
						
						
							
							Update modal size from lg to xl for improved layout on larger screens
						
						
						
						
						
						
					 | 
					
						2025-05-31 12:09:46 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							dbf7178db0
							
						
					 | 
					
						
						
							
							Replaced inline styles with Bootstrap utility classes
						
						
						
						
						
						
					 | 
					
						2025-05-31 12:08:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							d826acbb45
							
						
					 | 
					
						
						
							
							fixed width 100 % for editor
						
						
						
						
						
						
					 | 
					
						2025-05-31 12:07:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							4799e8e91c
							
						
					 | 
					
						
						
							
							it able t taking tag from any device
						
						
						
						
						
						
					 | 
					
						2025-05-31 12:06:40 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dbc9bbffa2
							
						
					 | 
					
						
						
							
							Create a new Weidget in Dashboard name "Attendance" and Adding a features to show chart and Table on it.
						
						
						
						
						
						
					 | 
					
						2025-05-31 11:39:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							07809d6635
							
						
					 | 
					
						
						
							
							Fixed conditional rendering logic for Directory project nav item
						
						
						
						
						
						
					 | 
					
						2025-05-31 09:42:54 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d16675bf71
							
						
					 | 
					
						
						
							
							Adding New Weidge in Dashboard Name is "Activity".
						
						
						
						
						
						
					 | 
					
						2025-05-30 16:19:20 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							30ce981a24
							
						
					 | 
					
						
						
							
							Comments popup submit button issue.
						
						
						
						
						
						
					 | 
					
						2025-05-30 07:15:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f20a7cf4bc
							
						
					 | 
					
						
						
							
							Changes in Comment popup
						
						
						
						
						
						
					 | 
					
						2025-05-30 07:15:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c3bcaea9e
							
						
					 | 
					
						
						
							
							Correction in Comment popup from Daily Progress Report.
						
						
						
						
						
						
					 | 
					
						2025-05-30 07:15:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							252bf0904e
							
						
					 | 
					
						
						
							
							In Create New Project form is not empty when we click on cancel button or cross.
						
						
						
						
						
						
					 | 
					
						2025-05-30 07:15:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4b64e7450e
							
						
					 | 
					
						
						
							
							Convert all date to DD-MM-YYYY accross all component.
						
						
						
						
						
						
					 | 
					
						2025-05-30 07:15:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5572b80f4a
							
						
					 | 
					
						
						
							
							In Assign Role popup double loading is visible.
						
						
						
						
						
						
					 | 
					
						2025-05-30 07:15:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0674fcf5bb
							
						
					 | 
					
						
						
							
							In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box.
						
						
						
						
						
						
					 | 
					
						2025-05-30 07:15:03 +00:00 | 
					
					
						
						
							
							
							
						
					 |