| 
						
					 | 
					
						
						
						
						
							
						
						
							a070d23304
							
						
					 | 
					
						
						
							
							added skeleton for dashboard card figures cards
						
						
						
						
						
						
					 | 
					
						2025-10-25 10:26:41 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c438b51ef1
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main
						
						
						
						
						
						
					 | 
					
						2025-10-24 13:04:39 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e5555ff9d
							
						
					 | 
					
						
						
							
							added properly permissions
						
						
						
						
						
						
					 | 
					
						2025-10-24 06:41:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6649cab6a2
							
						
					 | 
					
						
						
							
							Added cursor-not-allowed when user can delete the organization.
						
						
						
						
						
						
					 | 
					
						2025-10-13 14:16:11 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							136bc94c5b
							
						
					 | 
					
						
						
							
							removed dbugger and add new classes
						
						
						
						
						
						
					 | 
					
						2025-10-11 13:12:23 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							482f8a9bcb
							
						
					 | 
					
						
						
							
							added organization api in repo. and removed unuse files
						
						
						
						
						
						
					 | 
					
						2025-09-27 23:54:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ca8a41bb63
							
						
					 | 
					
						
						
							
							added style classes for footer
						
						
						
						
						
						
					 | 
					
						2025-09-27 09:29:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2ef1fcfd1d
							
						
					 | 
					
						
						
							
							successfullly assigned employe to project
						
						
						
						
						
						
					 | 
					
						2025-09-27 09:29:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod
							
						 
					 | 
					
						
						
						
						
							
						
						
							e610cc08c1
							
						
					 | 
					
						
						
							
							changed Uii for org. or project assigned
						
						
						
						
						
						
					 | 
					
						2025-09-20 18:47:09 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a3488c92b
							
						
					 | 
					
						
						
							
							convert inline style css class into class name
						
						
						
						
						
						
					 | 
					
						2025-09-18 15:23:48 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							83c2f7fb0c
							
						
					 | 
					
						
						
							
							set legal-info page css
						
						
						
						
						
						
					 | 
					
						2025-08-26 11:41:07 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							585199a2a1
							
						
					 | 
					
						
						
							
							fixed layout properly of login , reset, forgot, login-with-otp and forgot -pages
						
						
						
						
						
						
					 | 
					
						2025-08-25 20:15:51 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c350574171
							
						
					 | 
					
						
						
							
							- Add project list on emplyee profile
						
						
						
						
						
						
						
						- Add image as per gender 
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c0a6d8a89
							
						
					 | 
					
						
						
							
							Created new layout for employee profile page
						
						
						
						
						
						
					 | 
					
						2025-08-12 16:24:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d7adbac14
							
						
					 | 
					
						
						
							
							initial setup for tenant profile
						
						
						
						
						
						
					 | 
					
						2025-08-09 17:36:14 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb3b55c694
							
						
					 | 
					
						
						
							
							added spinkit loader and integrated inside projectDeatils and InfraPlanning
						
						
						
						
						
						
					 | 
					
						2025-08-08 14:11:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a3f9e57d9
							
						
					 | 
					
						
						
							
							added proper date
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:57:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							952dfefddc
							
						
					 | 
					
						
						
							
							resolved taking incorrect date range
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:57:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a77c26d6b
							
						
					 | 
					
						
						
							
							added proper date
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:47:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							597baede57
							
						
					 | 
					
						
						
							
							resolved taking incorrect date range
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:47:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da12099ba1
							
						
					 | 
					
						
						
							
							added proper date
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d7549e902
							
						
					 | 
					
						
						
							
							resolved taking incorrect date range
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3d7a8a1c94
							
						
					 | 
					
						
						
							
							attachement display horizontically
						
						
						
						
						
						
					 | 
					
						2025-08-06 10:22:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c8c954b9c
							
						
					 | 
					
						
						
							
							created skeleton css file
						
						
						
						
						
						
					 | 
					
						2025-08-06 00:17:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4d32d1de16
							
						
					 | 
					
						
						
							
							copy expense feature from Refactore_Expense
						
						
						
						
						
						
					 | 
					
						2025-08-06 00:04:26 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d3f21f33b6
							
						
					 | 
					
						
						
							
							added background color property for table row - 'tr-group'-  that grouping entities
						
						
						
						
						
						
					 | 
					
						2025-07-25 18:17:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e5e206bc8
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2
						
						
						
						
						
						
					 | 
					
						2025-07-17 17:30:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d2f761bd48
							
						
					 | 
					
						
						
							
							Changes in EmployeePage.
						
						
						
						
						
						
					 | 
					
						2025-07-16 13:08:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1fb50c667
							
						
					 | 
					
						
						
							
							Creating a new weidget Attendance Overview and accroding to project selection data will seen.
						
						
						
						
						
						
					 | 
					
						2025-07-16 13:08:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d6d98c7515
							
						
					 | 
					
						
						
							
							configure perfect scroll bar
						
						
						
						
						
						
					 | 
					
						2025-07-16 09:50:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a7eb0ee91
							
						
					 | 
					
						
						
							
							fixed card width in core.css
						
						
						
						
						
						
					 | 
					
						2025-07-15 07:32:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dce29422f4
							
						
					 | 
					
						
						
							
							fixed css bug
						
						
						
						
						
						
					 | 
					
						2025-07-15 07:32:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75dfe1f6aa
							
						
					 | 
					
						
						
							
							Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
						
						
						
						
						
						
					 | 
					
						2025-07-14 12:29:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b659dbd9ea
							
						
					 | 
					
						
						
							
							Sizing for the projects directory has been corrected.
						
						
						
						
						
						
					 | 
					
						2025-07-14 12:29:27 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f7ea1aa60a
							
						
					 | 
					
						
						
							
							Saved Username and Password Not Visible on Login Page Load
						
						
						
						
						
						
					 | 
					
						2025-07-14 12:27:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3be9f7aadb
							
						
					 | 
					
						
						
							
							Change brand log and remove some demo css
						
						
						
						
						
						
					 | 
					
						2025-07-06 11:15:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5bb27b6106
							
						
					 | 
					
						
						
							
							Modify project landing page
						
						
						
						
						
						
					 | 
					
						2025-07-02 15:11:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							882e3dd414
							
						
					 | 
					
						
						
							
							Project Address Text Overflow.
						
						
						
						
						
						
					 | 
					
						2025-06-20 15:55:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							38374caab3
							
						
					 | 
					
						
						
							
							Add cards in project list and diectory list views
						
						
						
						
						
						
					 | 
					
						2025-06-20 15:53:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3305c0b0d9
							
						
					 | 
					
						
						
							
							Add cosmatic changes to quill editor on contact notes page
						
						
						
						
						
						
					 | 
					
						2025-06-12 18:12:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							500006c1ef
							
						
					 | 
					
						
						
							
							Merge branch 'newFeature_Directory'
						
						
						
						
						
						
					 | 
					
						2025-06-10 20:18:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							435fa730b6
							
						
					 | 
					
						
						
							
							conmatic changes in avatar header menu drop down
						
						
						
						
						
						
						
						- add link for settings
- remove billing 
						
						
					 | 
					
						2025-06-10 13:45:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							45a300e540
							
						
					 | 
					
						
						
							
							added .card-minHeight class with 430px min-height
						
						
						
						
						
						
					 | 
					
						2025-06-09 13:14:00 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							76bbfee4fc
							
						
					 | 
					
						
						
							
							adjust modal close button appearance and position
						
						
						
						
						
						
					 | 
					
						2025-06-09 13:12:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a3608a49bd
							
						
					 | 
					
						
						
							
							remove sneat lables from application
						
						
						
						
						
						
					 | 
					
						2025-05-12 15:37:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							f51ed3a380
							
						
					 | 
					
						
						
							
							added custome font size class
						
						
						
						
						
						
					 | 
					
						2025-05-12 09:18:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							21e4af4e33
							
						
					 | 
					
						
						
							
							Changed header alignment to left-aligned in Project list view, employee list view and master view
						
						
						
						
						
						
					 | 
					
						2025-05-09 11:53:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0fc43bb55b
							
						
					 | 
					
						
						
							
							minor gui changes
						
						
						
						
						
						
					 | 
					
						2025-05-08 16:45:33 +05:30 | 
					
					
						
						
							
							
							
						
					 |