haroon amjad
							
						 | 
						
							
							
							
							
								
							
								db979977ca
								
							
								
							
						 | 
						
							
							
								
								Tamara implementation & enhancements
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								8166369f85
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
							
							
							# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart 
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								1d22e53f63
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
							
							
							# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								6ef9ae813d
								
							
								
							
						 | 
						
							
							
								
								doctors search filter added
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								10b77206f6
								
							
								
							
						 | 
						
							
							
								
								Immediate LiveCare consultation implementation contd.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								093e645f60
								
							
								
							
						 | 
						
							
							
								
								request medical report implementation completed.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								23942dc7bc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_dev
							
							
							
							
							
							
							
							# Conflicts:
#	lib/core/api/api_client.dart 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								51a4f83347
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature/lab_result
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								048f0bb459
								
							
								
							
						 | 
						
							
							
								
								graph design change
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								5f43063f2d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
							
							
							# Conflicts:
#	lib/core/app_assets.dart 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								512628fb8b
								
							
								
							
						 | 
						
							
							
								
								Lab result view along with the listing of  items is added
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								62e82a7a31
								
							
								
							
						 | 
						
							
							
								
								Empty data state implementation contd.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								dc16a684c5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_dev
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								94313b8870
								
							
								
							
						 | 
						
							
							
								
								Improved Error Handling
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								344ecaba18
								
							
								
							
						 | 
						
							
							
								
								LiveCare Schedule implementation done
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								b1af9e1779
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a711d3a6dd
								
							
								
							
						 | 
						
							
							
								
								LiveCare shcedule implementation contd.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c553876c8a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c35c38aeb1
								
							
								
							
						 | 
						
							
							
								
								onboarding screen added.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 Haroon6138
							
						 | 
						
							
							
							
							
								
							
								938d95cb06
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
							
							
							
							
							
							
							
							Reviewed-on: #55 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								32c7608c83
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								8621a525a2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature/search_by_region
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								27a0632d6d
								
							
								
							
						 | 
						
							
							
								
								directional padding and alignment
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								92c3033087
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into functionality/graph
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								5151997c7f
								
							
								
							
						 | 
						
							
							
								
								custom linear added with parameters to customize the properties of graph
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								005157fe5e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								3d1d78ba48
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								8f8c4c7f65
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								97038f1a25
								
							
								
							
						 | 
						
							
							
								
								advance payment implementation done for self & other file number
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								3e95999bf3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								1c2564a1e2
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								a79dcad221
								
							
								
							
						 | 
						
							
							
								
								family screen & widgets
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								4d52987c83
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
							
							
							
							
							
							
							
							# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/medical_file/medical_file_page.dart 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								5ce7548656
								
							
								
							
						 | 
						
							
							
								
								family file work-in-progress
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								467f10e952
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								0a653a61f2
								
							
								
							
						 | 
						
							
							
								
								family file bottomsheet added
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								17c47d093c
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2584e6cc6e
								
							
								
							
						 | 
						
							
							
								
								route animation improvement.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								bb0ac4a0fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c96081d07c
								
							
								
							
						 | 
						
							
							
								
								reverse animation time changed to 500ms.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								030c2a1b8a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								eafb52ab86
								
							
								
							
						 | 
						
							
							
								
								family file work in-progress
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								57827549b8
								
							
								
							
						 | 
						
							
							
								
								language switch added in drawer, and ui improvements
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								2b7656d83a
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								3ddd7781cd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f04f3bcd9c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c00e69ef0c
								
							
								
							
						 | 
						
							
							
								
								profile wallet linked with view model.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								55c51f5742
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature/search_by_region
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								033ae12499
								
							
								
							
						 | 
						
							
							
								
								api handling for clinic and doctor parameters and state management
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								3b1b51ef6f
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago |