haroon amjad
							
						 | 
						
							
							
							
							
								
							
								120f19de14
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_haroon' into 'master'
							
							
							
							
							
							
							
							Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!24 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								aabc86290a
								
							
								
							
						 | 
						
							
							
								
								Language change option added in app drawer
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								5c848fec87
								
							
								
							
						 | 
						
							
							
								
								Added UI Components for Marathon Module.. WIP
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								27ac98539f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								4024e5fd3f
								
							
								
							
						 | 
						
							
							
								
								updates & fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ff57d9291c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!23 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e7d2299b43
								
							
								
							
						 | 
						
							
							
								
								improvement.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								27b5cbfdf6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/work_list/worklist_detail_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a5a2f48b70
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Chat Search User Api Implementation
See merge request Cloud_Solution/mohemm-flutter-app!22 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0213a7a4ef
								
							
								
							
						 | 
						
							
							
								
								worklist api calling delay fixed.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c29d003401
								
							
								
							
						 | 
						
							
							
								
								services dynamic list issue fixed on payslip
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								90b60ce55a
								
							
								
							
						 | 
						
							
							
								
								Chat Search User Api Implementation
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								a623765510
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								caa5513e62
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_haroon' into 'master'
							
							
							
							
							
							
							
							PR PO fixes, Worklist fixes
See merge request Cloud_Solution/mohemm-flutter-app!21 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								109c0ca0a2
								
							
								
							
						 | 
						
							
							
								
								PR PO fixes, Worklist fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								8fa6d363c9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								05c6cc7f14
								
							
								
							
						 | 
						
							
							
								
								Chat Search User Api Implementation
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								d4b31d4338
								
							
								
							
						 | 
						
							
							
								
								Chat Login Api Implementation
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								8f9fb5eb1d
								
							
								
							
						 | 
						
							
							
								
								image fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c8d25c997b
								
							
								
							
						 | 
						
							
							
								
								Revert "updates"
							
							
							
							
							
							
							
							This reverts commit 981fc9f8d207334488189c9051042d3792452592. 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								da7929bf3e
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								eea0df3614
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5e651dcc1b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Chat Login Api Implementation
See merge request Cloud_Solution/mohemm-flutter-app!19 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								a90da83fa5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/api/chat/chat_provider_model.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b544273416
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								d24103b872
								
							
								
							
						 | 
						
							
							
								
								Chat Login Api Implementation
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								02aff92726
								
							
								
							
						 | 
						
							
							
								
								advance search improvement, approve delegate added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b429b139c8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/work_list/worklist_detail_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a4483fcadf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_haroon' into 'master'
							
							
							
							
							
							
							
							Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!18 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								f07167e734
								
							
								
							
						 | 
						
							
							
								
								Leave balance fix, Items for sale fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								847b9df6fc
								
							
								
							
						 | 
						
							
							
								
								date fix in dashboard
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								5b5cc16b90
								
							
								
							
						 | 
						
							
							
								
								Advanced Search implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								7aa2e0f000
								
							
								
							
						 | 
						
							
							
								
								code of conduct, workmen regulations added. & improvement.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								8923b49546
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/login/login_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								34cb722b96
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								80a3d179eb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!17 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								200b56a992
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								49bd4114ce
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d200624ac2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								32b444334e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Deri Chat Implementation
See merge request Cloud_Solution/mohemm-flutter-app!16 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								963dcce941
								
							
								
							
						 | 
						
							
							
								
								adding chat option on dashboard
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								57ebe40b5d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/landing/dashboard_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								574d80b9e1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								e115137205
								
							
								
							
						 | 
						
							
							
								
								Chat Implementation Version 1
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d26b7e0753
								
							
								
							
						 | 
						
							
							
								
								worklist improvements
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								91abaa8475
								
							
								
							
						 | 
						
							
							
								
								improvements.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6572505c67
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue...
See merge request Cloud_Solution/mohemm-flutter-app!15 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5c5da60b12
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ae69450f45
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sultan-dev' into 'master'
							
							
							
							
							
							
							
							Sultan dev
See merge request Cloud_Solution/mohemm-flutter-app!14 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d61315a5fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago |