WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								8578319cc3
								
							
								
							
						 | 
						
							
							
								
								asset inventory module  ready for qa
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								dfef9aadb7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a9973047d6
								
							
								
							
						 | 
						
							
							
								
								improvement
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								e5775019a4
								
							
								
							
						 | 
						
							
							
								
								asset inventory design
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4d035e9c46
								
							
								
							
						 | 
						
							
							
								
								android AGP upgraded & enhancement.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3ac3c11b4b
								
							
								
							
						 | 
						
							
							
								
								improvement
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								423968d7f6
								
							
								
							
						 | 
						
							
							
								
								timer history added
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f9c7d335e2
								
							
								
							
						 | 
						
							
							
								
								file format.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								e40d9a1138
								
							
								
							
						 | 
						
							
							
								
								ATOMS-1025, ATOMS-937 and some color fixes for dark mode
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5e9e8dc870
								
							
								
							
						 | 
						
							
							
								
								assistant employee selection sheet ui improvement.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								7efeeed619
								
							
								
							
						 | 
						
							
							
								
								bottom sheet ui improvements,safe area added.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								df66cf5c77
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b7aefbe7f3
								
							
								
							
						 | 
						
							
							
								
								task contact info in detail view, & improvements
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								9a332e86e2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'design_3.0_TM_Module' into design_3.0_task_module_new_merge
							
							
							
							
							
							
							
							# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c1a7562e3b
								
							
								
							
						 | 
						
							
							
								
								create asset transfer, on internal & external destination values reset.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								630c1533e7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
							
							
							
							
							
							
							
							# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/pages/user/requests/create_service_request_page.dart
#	lib/views/widgets/images/multi_image_picker.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								642d1a908c
								
							
								
							
						 | 
						
							
							
								
								auto login improvement.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								waseemabbasi22
							
						 | 
						
							
							
							
							
								
							
								6c3f36944a
								
							
								
							
						 | 
						
							
							
								
								auth and attachment fixes
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e0ad359295
								
							
								
							
						 | 
						
							
							
								
								system bottom navigation bar theme improvement.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f3539f1471
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								19ee892d67
								
							
								
							
						 | 
						
							
							
								
								app timer, time and date picker color improvements.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c1b1f37eec
								
							
								
							
						 | 
						
							
							
								
								asset search loading ui fixed.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								1edcea47be
								
							
								
							
						 | 
						
							
							
								
								1.3.6+25 merge conflict resolved.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								47673e3473
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
							
							
							
							
							
							
							
							# Conflicts:
#	lib/modules/cm_module/views/components/action_button/footer_action_button.dart
#	lib/modules/cm_module/views/components/service_request_detail_view.dart
#	lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
#	lib/modules/tm_module/tasks_wo/update_task_request_view.dart
#	lib/views/pages/user/gas_refill/update_gas_refill_request.dart
#	lib/views/widgets/images/multi_image_picker.dart 
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								89865c0ddd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_dark_mode' into design_3.0_TM_Module_attachmentFix
							
							
							
							
							
							
							
							# Conflicts:
#	lib/modules/cm_module/views/forms/asset_retired/verify_asset_detail.dart
#	lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
#	lib/modules/pm_module/ppm_wo/update_ppm/ppm_calibration_tools_form.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart 
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								4e665d1959
								
							
								
							
						 | 
						
							
							
								
								attachment fixes
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								8d9aacb870
								
							
								
							
						 | 
						
							
							
								
								dark mode fixes
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								6d39b20e0b
								
							
								
							
						 | 
						
							
							
								
								dark mode implementation
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ca1ff5892e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
							
							
							
							
							
							
							
							# Conflicts:
#	lib/modules/cm_module/service_request_detail_provider.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart 
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								262b3aa42f
								
							
								
							
						 | 
						
							
							
								
								local auth fail handling and improvements.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d9f3a4e73a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								b35522d8e6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_snagsFix' into design_3.0_TM_Module_snagsFix
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								503f3a6feb
								
							
								
							
						 | 
						
							
							
								
								multiple assistant employee added for asset transfer and service-request
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								1285ae68ec
								
							
								
							
						 | 
						
							
							
								
								multiple assistant employee structure added
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								37c3b54237
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6adea49150
								
							
								
							
						 | 
						
							
							
								
								image full screen loading improvement
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								32627bbda1
								
							
								
							
						 | 
						
							
							
								
								form fixes
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								754ec458a4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new
							
							
							
							
							
							
							
							# Conflicts:
#	lib/views/widgets/images/multi_image_picker.dart 
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4c92525589
								
							
								
							
						 | 
						
							
							
								
								1.3.3+22 uploaded
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								12752535b8
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3181e666be
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0a38bdd9e1
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								eead9bed02
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c92aae9048
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d5059758ac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								bf44e5cbec
								
							
								
							
						 | 
						
							
							
								
								verification method issue fixed, if requester not confirms arrival.
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								616ce9b630
								
							
								
							
						 | 
						
							
							
								
								timer picker end date selection fixed.
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6539848f31
								
							
								
							
						 | 
						
							
							
								
								method name fix.
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								be2fd8a2d5
								
							
								
							
						 | 
						
							
							
								
								1.3.1+20 uploaded on stores
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f3f09d1eb2
								
							
								
							
						 | 
						
							
							
								
								timer improvements
							
							
							
							
							
						 | 
						
							4 months ago |