| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							471be2edd8
							
						
					 | 
					
						
						
							
							Merge pull request 'Status code 400 showing on Logs tab and Daily Progress Report datepicker issue.' (#157) from Kartik_Bug#392 into Issue_May_5W
						
						
						
						
						
						
						
						Reviewed-on: #157 
						
						
					 | 
					
						2025-05-31 08:09:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c8461e72a
							
						
					 | 
					
						
						
							
							Merge pull request 'pramod_Enhancement-#420 : Minor UI Enhancements – Modal Size & Responsive Adjustments' (#165) from pramod_Enhancement-#420 into Feature_Directory
						
						
						
						
						
						
						
						Reviewed-on: #165 
						
						
					 | 
					
						2025-05-31 06:52:09 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99d8be1e4b
							
						
					 | 
					
						
						
							
							Merge pull request 'pramod_Task#410 : Display Directory Feature at Project Section' (#162) from pramod_Task#410 into Feature_Directory
						
						
						
						
						
						
						
						Reviewed-on: #162 
						
						
					 | 
					
						2025-05-30 07:15:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							05f4a9da4d
							
						
					 | 
					
						
						
							
							added restrict access to Project > Directory tab to authorized users only
						
						
						
						
						
						
					 | 
					
						2025-05-30 11:55:56 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5bcf7111b
							
						
					 | 
					
						
						
							
							added directory feature
						
						
						
						
						
						
					 | 
					
						2025-05-30 11:42:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6774957558
							
						
					 | 
					
						
						
							
							Added props to hide component based on role; identifies if it's a page or component
						
						
						
						
						
						
					 | 
					
						2025-05-30 11:42:27 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							3594b78253
							
						
					 | 
					
						
						
							
							added more option for sorting contact list - projectId
						
						
						
						
						
						
					 | 
					
						2025-05-30 11:40:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e93062bdf4
							
						
					 | 
					
						
						
							
							changed directory menu icon
						
						
						
						
						
						
					 | 
					
						2025-05-30 11:39:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							445a5e0064
							
						
					 | 
					
						
						
							
							loader, not found text moved in centered area
						
						
						
						
						
						
					 | 
					
						2025-05-30 11:39:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							5666616b6b
							
						
					 | 
					
						
						
							
							changed restore icon
						
						
						
						
						
						
					 | 
					
						2025-05-30 11:38:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							15d313baf1
							
						
					 | 
					
						
						
							
							chnaged badge type
						
						
						
						
						
						
					 | 
					
						2025-05-30 11:38:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d74854b847
							
						
					 | 
					
						
						
							
							Merge pull request 'pramod_Task-#399 : Added Access Permission For 'Directory User' Role' (#160) from pramod_Task-#399 into Feature_Directory
						
						
						
						
						
						
						
						Reviewed-on: #160 
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb678585fa
							
						
					 | 
					
						
						
							
							removed unused props
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ff79b5854
							
						
					 | 
					
						
						
							
							display contact profile data
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							616df5e869
							
						
					 | 
					
						
						
							
							Added id check before calling fetchContactNotes function
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							a88a8d3df9
							
						
					 | 
					
						
						
							
							Add restore feature for deleted notes
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							36e7755b7d
							
						
					 | 
					
						
						
							
							aded validation for tags and rename label to bucket
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							73f57bb59f
							
						
					 | 
					
						
						
							
							removed new contact button form header
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							41cbf69550
							
						
					 | 
					
						
						
							
							changed table column email to role
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b5f7e69ab
							
						
					 | 
					
						
						
							
							added restore feature for contacts
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							85a957c204
							
						
					 | 
					
						
						
							
							fixed console warning
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6fe62e7c0e
							
						
					 | 
					
						
						
							
							added wrapped DirProver for context
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5d3b0fd08
							
						
					 | 
					
						
						
							
							Support tag creation on spacebar key
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd4d4f0386
							
						
					 | 
					
						
						
							
							changed useDirectory hook calling format
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							acbe3f44b5
							
						
					 | 
					
						
						
							
							changed delete contact Url
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b268763283
							
						
					 | 
					
						
						
							
							changed navigation tab layout
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							767d8abd19
							
						
					 | 
					
						
						
							
							changed font size
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							5531d408f9
							
						
					 | 
					
						
						
							
							corrected state name, mismatched
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							3330565dcb
							
						
					 | 
					
						
						
							
							added margin btwn bucket name in filter dropdwon
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							4628dea561
							
						
					 | 
					
						
						
							
							Fixed case mismatch in error rendering (BucketIds ➝ bucketIds)
						
						
						
						
						
						
					 | 
					
						2025-05-29 17:49:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							225f22153d
							
						
					 | 
					
						
						
							
							Merge pull request 'pramod_Task-#398 : Added Access Permission For 'Manage Buckets' Role' (#159) from pramod_Task-#398 into Feature_Directory
						
						
						
						
						
						
						
						Reviewed-on: #159 
						
						
					 | 
					
						2025-05-28 19:47:44 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c66a9a083
							
						
					 | 
					
						
						
							
							Prevent error by safely accessing bucket creator with optional chaining
						
						
						
						
						
						
					 | 
					
						2025-05-29 00:46:58 +05:30 | 
					
					
						
						
							
							
							
						
					 |