| 
						
					 | 
					
						
						
						
						
							
						
						
							6ca6ec31f7
							
						
					 | 
					
						
						
							
							landing page modifications
						
						
						
						
						
						
					 | 
					
						2025-09-09 12:06:10 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							849709ad05
							
						
					 | 
					
						
						
							
							Merge pull request 'Toggle Button Functionality for Deleted Notes Not Working Correctly' (#375) from Kartik_Bug#1056 into Document_Manag
						
						
						
						
						
						
						
						Reviewed-on: #375 
						
						
					 | 
					
						2025-09-09 05:33:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1abed1de3a
							
						
					 | 
					
						
						
							
							managebucket component is split
						
						
						
						
						
						
					 | 
					
						2025-09-09 01:49:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b98c60120
							
						
					 | 
					
						
						
							
							Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
						
						
						
						
						
						
					 | 
					
						2025-09-08 16:04:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4295e7d8d6
							
						
					 | 
					
						
						
							
							UI Changes in Document Details popup.
						
						
						
						
						
						
					 | 
					
						2025-09-08 16:04:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f72b7c62c8
							
						
					 | 
					
						
						
							
							add RootRedirect for "/" path to handle login and dashboard routing
						
						
						
						
						
						
					 | 
					
						2025-09-08 15:55:50 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							01a3f5809a
							
						
					 | 
					
						
						
							
							login Opt will be expire in % min
						
						
						
						
						
						
					 | 
					
						2025-09-08 15:17:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bb7e488bb0
							
						
					 | 
					
						
						
							
							Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
						
						
						
						
						
						
					 | 
					
						2025-09-08 15:06:29 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da8d63ce62
							
						
					 | 
					
						
						
							
							changed msg whenenver emp not found- "No team members assigned yet"
						
						
						
						
						
						
					 | 
					
						2025-09-08 15:06:24 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef0eff98f8
							
						
					 | 
					
						
						
							
							Remove unwanted icon
						
						
						
						
						
						
					 | 
					
						2025-09-08 14:55:33 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2a833196f8
							
						
					 | 
					
						
						
							
							Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
						
						
						
						
						
						
					 | 
					
						2025-09-08 14:54:20 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							97a4a4593e
							
						
					 | 
					
						
						
							
							Changes In Popup of Document Manager popup.
						
						
						
						
						
						
					 | 
					
						2025-09-08 14:54:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a112886897
							
						
					 | 
					
						
						
							
							Merge pull request 'Date Picker in Employee Attendance & Activity Tab Should Default to Last 7 Days' (#374) from Kartik_Bug#1052 into Issues_Sep_1W
						
						
						
						
						
						
						
						Reviewed-on: #374 
						
						
					 | 
					
						2025-09-08 09:11:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db38c5fefa
							
						
					 | 
					
						
						
							
							Merge branch 'Issues_Sep_1W' into Kartik_Bug#1052
						
						
						
						
						
						
					 | 
					
						2025-09-08 09:11:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c6f16249fd
							
						
					 | 
					
						
						
							
							Merge pull request 'Filter icon should not be displayed when no records are found in Daily Progress Report' (#373) from Kartik_Bug#1042 into Issues_Sep_1W
						
						
						
						
						
						
						
						Reviewed-on: #373 
						
						
					 | 
					
						2025-09-08 09:09:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							63a5f7b902
							
						
					 | 
					
						
						
							
							normalize projectId from localStorage to avoid "null" string
						
						
						
						
						
						
					 | 
					
						2025-09-08 14:22:23 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ace507232a
							
						
					 | 
					
						
						
							
							changed dashboard route "/" to "/dashboard"
						
						
						
						
						
						
					 | 
					
						2025-09-08 12:48:19 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9876c6d52
							
						
					 | 
					
						
						
							
							spell correction
						
						
						
						
						
						
					 | 
					
						2025-09-08 12:40:14 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6d86362e9e
							
						
					 | 
					
						
						
							
							Merge branch 'Landing_pages' into Document_Manag
						
						
						
						
						
						
						
						# Conflicts:
#	src/pages/authentication/LoginPage.jsx
#	src/pages/employee/EmployeeList.jsx
#	src/router/AppRoutes.jsx 
						
						
					 | 
					
						2025-09-08 12:34:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							698c1b7b16
							
						
					 | 
					
						
						
							
							add new images
						
						
						
						
						
						
						
						replase class= with className= 
						
						
					 | 
					
						2025-09-08 12:32:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e216ac16ef
							
						
					 | 
					
						
						
							
							Merge pull request 'Change the UI of all components and add stars for all mandatory fields.' (#370) from UI_Changes_PMS into Document_Manag
						
						
						
						
						
						
						
						Reviewed-on: #370 
						
						
					 | 
					
						2025-09-08 06:30:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0194c4427a
							
						
					 | 
					
						
						
							
							Merge branch 'UI_Changes_PMS' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS
						
						
						
						
						
						
					 | 
					
						2025-09-08 11:57:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ea022d37c8
							
						
					 | 
					
						
						
							
							Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS
						
						
						
						
						
						
					 | 
					
						2025-09-08 11:50:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							957f790fce
							
						
					 | 
					
						
						
							
							initially created ManageBucket
						
						
						
						
						
						
					 | 
					
						2025-09-08 11:40:03 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a472b39ef
							
						
					 | 
					
						
						
							
							initialli refactoring directory
						
						
						
						
						
						
					 | 
					
						2025-09-08 10:14:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							768f810465
							
						
					 | 
					
						
						
							
							All symbols will be same in all components.
						
						
						
						
						
						
					 | 
					
						2025-09-05 17:17:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7ed6a7e5b9
							
						
					 | 
					
						
						
							
							UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same.
						
						
						
						
						
						
					 | 
					
						2025-09-05 16:53:48 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5c59ac3115
							
						
					 | 
					
						
						
							
							Create Employee Change the date box into DatePicker.
						
						
						
						
						
						
					 | 
					
						2025-09-05 13:07:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7e81649841
							
						
					 | 
					
						
						
							
							Toggle Button Functionality for Deleted Notes Not Working Correctly
						
						
						
						
						
						
					 | 
					
						2025-09-05 12:45:28 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c568dc9108
							
						
					 | 
					
						
						
							
							Date Picker in Employee Attendance & Activity Tab Should Default to Last 7 Days
						
						
						
						
						
						
					 | 
					
						2025-09-05 12:33:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dcb2f59f5b
							
						
					 | 
					
						
						
							
							Filter icon should not be displayed when no records are found in Daily Progress Report
						
						
						
						
						
						
					 | 
					
						2025-09-05 12:26:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e39355c6fd
							
						
					 | 
					
						
						
							
							Changes in UI for Masters component.
						
						
						
						
						
						
					 | 
					
						2025-09-05 12:00:26 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9fe987a94
							
						
					 | 
					
						
						
							
							changed useproject hook name
						
						
						
						
						
						
					 | 
					
						2025-09-05 11:58:36 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							87221965de
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
						
						
						
						
						
						
					 | 
					
						2025-09-05 11:52:50 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6caad7850d
							
						
					 | 
					
						
						
							
							clear and structured code
						
						
						
						
						
						
					 | 
					
						2025-09-05 11:45:04 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8f8cbf27ef
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS
						
						
						
						
						
						
					 | 
					
						2025-09-05 11:44:27 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0db0edec1a
							
						
					 | 
					
						
						
							
							Masters Popup all heading show in Center align.
						
						
						
						
						
						
					 | 
					
						2025-09-05 11:19:35 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42b6802419
							
						
					 | 
					
						
						
							
							Merge pull request 'Issues_Aug_2W' (#371) from Issues_Aug_2W into main
						
						
						
						
						
						
						
						Reviewed-on: #371
Merged 
						
						
					 | 
					
						2025-09-05 05:45:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cabb1b01c9
							
						
					 | 
					
						
						
							
							don't changed project when move to one page to another page
						
						
						
						
						
						
					 | 
					
						2025-09-05 11:14:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f56fd23cbf
							
						
					 | 
					
						
						
							
							In Create Project popup change the noraml date selection to DatePicker.
						
						
						
						
						
						
					 | 
					
						2025-09-05 11:12:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6dfdaf3316
							
						
					 | 
					
						
						
							
							changed name useSelectedproject to useSelectedProject
						
						
						
						
						
						
					 | 
					
						2025-09-05 11:06:38 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4369705a2d
							
						
					 | 
					
						
						
							
							Merge branch 'Issues_Aug_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_2W
						
						
						
						
						
						
					 | 
					
						2025-09-05 10:53:35 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34654aae0a
							
						
					 | 
					
						
						
							
							: rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject
						
						
						
						
						
						
					 | 
					
						2025-09-05 10:53:05 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2b5fc9aaac
							
						
					 | 
					
						
						
							
							added project level feature
						
						
						
						
						
						
					 | 
					
						2025-09-04 18:06:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1eaf4a080c
							
						
					 | 
					
						
						
							
							fixed confirm modal close button
						
						
						
						
						
						
					 | 
					
						2025-09-04 14:18:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fe3d356c2e
							
						
					 | 
					
						
						
							
							Ui changed  for document version list
						
						
						
						
						
						
					 | 
					
						2025-09-04 14:16:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f3913c2824
							
						
					 | 
					
						
						
							
							Change the UI of all components and add stars for all mandatory fields.
						
						
						
						
						
						
					 | 
					
						2025-09-03 17:19:29 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e66ce11cd5
							
						
					 | 
					
						
						
							
							changes tage reponse and changed confirm modal format
						
						
						
						
						
						
					 | 
					
						2025-09-03 16:40:20 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a8239d5c31
							
						
					 | 
					
						
						
							
							document version list  display 10 version at per page
						
						
						
						
						
						
					 | 
					
						2025-09-03 15:49:12 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							97a32b8f42
							
						
					 | 
					
						
						
							
							display suggestion for tags when create or update documen form
						
						
						
						
						
						
					 | 
					
						2025-09-03 15:45:50 +05:30 | 
					
					
						
						
							
							
							
						
					 |