Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							76aa9200f7
							
						
					 | 
					
						
						
							
							added Breadcrumb for image gallary
						
						
						
						
						
						
					 | 
					
						2025-07-07 13:25:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							287d116609
							
						
					 | 
					
						
						
							
							added cosmetic changes
						
						
						
						
						
						
					 | 
					
						2025-07-07 12:52:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f45a805e1
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Images_gallery_filter
						
						
						
						
						
						
					 | 
					
						2025-07-07 12:43:24 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							04ffa0f645
							
						
					 | 
					
						
						
							
							fixed  filter button of image galllary
						
						
						
						
						
						
					 | 
					
						2025-07-07 12:42:19 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c88af2441f
							
						
					 | 
					
						
						
							
							Added condition to check if number of images uploaded is greater than 0
						
						
						
						
						
						
					 | 
					
						2025-07-07 11:25:41 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							58187db80a
							
						
					 | 
					
						
						
							
							added default active status at create new project
						
						
						
						
						
						
					 | 
					
						2025-07-07 11:09:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9447178985
							
						
					 | 
					
						
						
							
							added format number
						
						
						
						
						
						
					 | 
					
						2025-07-07 10:59:51 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e97031c0e1
							
						
					 | 
					
						
						
							
							Merge pull request 'Changes in Image gallery and integrating singnalR.' (#231) from Kartik_Task#661 into Images_gallery_filter
						
						
						
						
						
						
						
						Reviewed-on: #231 
						
						
					 | 
					
						2025-07-07 04:35:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							035ef6c099
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query
						
						
						
						
						
						
					 | 
					
						2025-07-06 22:18:54 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							10ee3796d3
							
						
					 | 
					
						
						
							
							Optimized to avoid unnecessary API calls
						
						
						
						
						
						
					 | 
					
						2025-07-06 22:10:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8676ff24a5
							
						
					 | 
					
						
						
							
							handle to prevent unwanted api calling
						
						
						
						
						
						
					 | 
					
						2025-07-06 15:51:46 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9eb8418330
							
						
					 | 
					
						
						
							
							Change the design of Filter drower.
						
						
						
						
						
						
					 | 
					
						2025-07-06 13:37:42 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5b1f9d31f
							
						
					 | 
					
						
						
							
							added completedWork , plannedWork for progrss line with formatnumber util
						
						
						
						
						
						
					 | 
					
						2025-07-06 13:11:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							485c7f2347
							
						
					 | 
					
						
						
							
							format number
						
						
						
						
						
						
					 | 
					
						2025-07-06 12:39:39 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							52eeede904
							
						
					 | 
					
						
						
							
							Merge branch 'Issues_July_1W'
						
						
						
						
						
						
					 | 
					
						2025-07-06 11:21:24 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3be9f7aadb
							
						
					 | 
					
						
						
							
							Change brand log and remove some demo css
						
						
						
						
						
						
					 | 
					
						2025-07-06 11:15:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4adfbc8e8e
							
						
					 | 
					
						
						
							
							Adding next and previous button hide and correction in filter logic.
						
						
						
						
						
						
					 | 
					
						2025-07-05 21:59:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aebae577df
							
						
					 | 
					
						
						
							
							Changes in Image gallery and integrating singnalR.
						
						
						
						
						
						
					 | 
					
						2025-07-05 18:09:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb1f048059
							
						
					 | 
					
						
						
							
							Merge pull request 'Project Not Visible When Created with "In Progress" Status Selected from Filter' (#230) from Kartik_Bug#641 into Issues_July_1W
						
						
						
						
						
						
						
						Reviewed-on: #230 
						
						
					 | 
					
						2025-07-05 11:15:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0af211a218
							
						
					 | 
					
						
						
							
							Merge pull request 'Image_Gallery' (#229) from Image_Gallery into main
						
						
						
						
						
						
						
						Reviewed-on: #229 
						
						
					 | 
					
						2025-07-05 11:14:41 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6914b1cd90
							
						
					 | 
					
						
						
							
							Merge pull request 'Reduce the checkbox size and remove unnecessary spacing within the Directory Notes and Contact filters.' (#228) from Kartik_Bug#612 into Issues_July_1W
						
						
						
						
						
						
						
						Reviewed-on: #228 
						
						
					 | 
					
						2025-07-05 11:13:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							981a7b121e
							
						
					 | 
					
						
						
							
							Project Not Visible When Created with "In Progress" Status Selected from Filter
						
						
						
						
						
						
					 | 
					
						2025-07-05 11:45:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							87a7b49948
							
						
					 | 
					
						
						
							
							Changes in Image Gallery creating changing the filter icon adding box at the time of Work Category.
						
						
						
						
						
						
					 | 
					
						2025-07-04 15:21:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1f9dcbbc82
							
						
					 | 
					
						
						
							
							Merge branch 'Issues_July_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_1W
						
						
						
						
						
						
						
						# Conflicts:
#	src/pages/authentication/ChangePassword.jsx 
						
						
					 | 
					
						2025-07-04 14:14:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8f9f0091ea
							
						
					 | 
					
						
						
							
							modify change password UI
						
						
						
						
						
						
					 | 
					
						2025-07-04 14:13:19 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							115740c4dc
							
						
					 | 
					
						
						
							
							modify change password UI
						
						
						
						
						
						
					 | 
					
						2025-07-04 13:24:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							28c226904e
							
						
					 | 
					
						
						
							
							closed modal after update activity and format number of plannedwork and completed work at project overview
						
						
						
						
						
						
					 | 
					
						2025-07-04 12:39:10 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb1c4fc765
							
						
					 | 
					
						
						
							
							show denied msg on Daily Task planning page if don't have manage infra and assign task
						
						
						
						
						
						
					 | 
					
						2025-07-04 12:37:55 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							afac84dc9b
							
						
					 | 
					
						
						
							
							now displayed cancel and submit button at initially - bug643
						
						
						
						
						
						
					 | 
					
						2025-07-04 11:47:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a6169c106f
							
						
					 | 
					
						
						
							
							Changes in Filter drower increase its size.
						
						
						
						
						
						
					 | 
					
						2025-07-04 11:31:35 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							20c9dca759
							
						
					 | 
					
						
						
							
							added formatNumber at globally for reusable
						
						
						
						
						
						
					 | 
					
						2025-07-04 11:29:24 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							5949e7c277
							
						
					 | 
					
						
						
							
							improved empty state UI when no projects are found
						
						
						
						
						
						
					 | 
					
						2025-07-04 11:10:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							a107041153
							
						
					 | 
					
						
						
							
							chnanged status color, becuase Active status is hold success color, therefor chnages success to primary for In-progress status
						
						
						
						
						
						
					 | 
					
						2025-07-04 10:53:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca476d6f6e
							
						
					 | 
					
						
						
							
							removed unused code
						
						
						
						
						
						
					 | 
					
						2025-07-04 10:52:07 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e54ed1dd9
							
						
					 | 
					
						
						
							
							display project Name at header when location have project details
						
						
						
						
						
						
					 | 
					
						2025-07-04 10:51:41 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c6e0b5c9e
							
						
					 | 
					
						
						
							
							added project status - 'In-Progress'
						
						
						
						
						
						
					 | 
					
						2025-07-04 10:50:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9961b4aba7
							
						
					 | 
					
						
						
							
							removed unused code
						
						
						
						
						
						
					 | 
					
						2025-07-04 10:49:35 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							09906420a6
							
						
					 | 
					
						
						
							
							Adding Date Range picker in filter dropdown.
						
						
						
						
						
						
					 | 
					
						2025-07-04 10:18:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b39a3d7e97
							
						
					 | 
					
						
						
							
							fixed: visible sub task without refresh page
						
						
						
						
						
						
					 | 
					
						2025-07-03 19:10:49 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							094811a8ec
							
						
					 | 
					
						
						
							
							floor Name  field clear clear after complete edit or create operation
						
						
						
						
						
						
					 | 
					
						2025-07-03 17:09:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a94facb062
							
						
					 | 
					
						
						
							
							Changes in Directory filter adding clear and apply button and calling api at the time apply filter.
						
						
						
						
						
						
					 | 
					
						2025-07-03 14:49:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6d6f0ac30
							
						
					 | 
					
						
						
							
							Handle undefined 'variables' in employee assignment toast logic
						
						
						
						
						
						
					 | 
					
						2025-07-03 13:16:01 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e24b873677
							
						
					 | 
					
						
						
							
							added projectId , project id was missed
						
						
						
						
						
						
					 | 
					
						2025-07-03 12:16:35 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							25b2f6973c
							
						
					 | 
					
						
						
							
							fixed format planned vs remaining work values to avoid float precision issues in task UI
						
						
						
						
						
						
					 | 
					
						2025-07-02 20:07:35 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							80083aa5db
							
						
					 | 
					
						
						
							
							updated some queries and mutation for prevent to duplicates calls
						
						
						
						
						
						
					 | 
					
						2025-07-02 19:42:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99601095b5
							
						
					 | 
					
						
						
							
							To show ImageGallery in our project.
						
						
						
						
						
						
					 | 
					
						2025-07-02 18:28:08 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5bb27b6106
							
						
					 | 
					
						
						
							
							Modify project landing page
						
						
						
						
						
						
					 | 
					
						2025-07-02 15:11:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb1dec6c93
							
						
					 | 
					
						
						
							
							Added new field in contact create and update form
						
						
						
						
						
						
					 | 
					
						2025-07-02 15:06:01 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							52c5e3d2d2
							
						
					 | 
					
						
						
							
							integrated reactquery for project infra
						
						
						
						
						
						
					 | 
					
						2025-07-02 13:20:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f110b7ead
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query
						
						
						
						
						
						
					 | 
					
						2025-07-02 09:49:20 +05:30 | 
					
					
						
						
							
							
							
						
					 |