haroon amjad
							
						 | 
						
							
							
							
							
								
							
								3e95999bf3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								1c2564a1e2
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								6048b3b5f1
								
							
								
							
						 | 
						
							
							
								
								Advance payment module implementation contd.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								8240d3e78d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/authentication/register_step2.dart 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								a4854bbe4a
								
							
								
							
						 | 
						
							
							
								
								Habib Wallet updates
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 Haroon6138
							
						 | 
						
							
							
							
							
								
							
								25f0b9d415
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'haroon_dev' (#49) from haroon_dev into master
							
							
							
							
							
							
							
							Reviewed-on: #49 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								bdde6c224d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 Haroon6138
							
						 | 
						
							
							
							
							
								
							
								2c405aa0c3
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'ui improvement.' (#47) from dev_sikander into master
							
							
							
							
							
							
							
							Reviewed-on: #47 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 Haroon6138
							
						 | 
						
							
							
							
							
								
							
								5e82e02323
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'Location functionality' (#48) from functionality/location into master
							
							
							
							
							
							
							
							Reviewed-on: #48 
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								c9206f1ab8
								
							
								
							
						 | 
						
							
							
								
								Radiology report implemented
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								3b5d2d27a4
								
							
								
							
						 | 
						
							
							
								
								Updates
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								3fdd17ccaa
								
							
								
							
						 | 
						
							
							
								
								code added to get the location for gms hms and iphone. fallback added if the last known location is null.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								17c47d093c
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								99e1036043
								
							
								
							
						 | 
						
							
							
								
								ui improvement.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								4f4bef9d6f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/home/landing_page.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								2961583414
								
							
								
							
						 | 
						
							
							
								
								update
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								bb0ac4a0fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								928a056cbc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								5e81ba1ed8
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3267317457
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/home/landing_page.dart 
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c191fd0be1
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c83754fc4a
								
							
								
							
						 | 
						
							
							
								
								user profile welcome widget improvement.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								8f0e910e4f
								
							
								
							
						 | 
						
							
							
								
								profile and settings ui completed.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								28a95959e0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								5de8314f3f
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								05cf451181
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New
							
							
							
							
							
							
							
							# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								5de5fc8be9
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 Haroon6138
							
						 | 
						
							
							
							
							
								
							
								2ced674311
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo' (#40) from feature/search_by_region into master
							
							
							
							
							
							
							
							Reviewed-on: #40 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								de6e0e3704
								
							
								
							
						 | 
						
							
							
								
								data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								b9b0dfd1fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								15c07cb4e2
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								71a07eed8e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								788887a7f1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature/search_by_region
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								2174e0e292
								
							
								
							
						 | 
						
							
							
								
								viewmodel and repo updated for the appointment by region selection.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								9c2dd721b4
								
							
								
							
						 | 
						
							
							
								
								bottom sheets added of region facitlity and hospital.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								f9e7c8988a
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								6b766e558d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								fbd6ef0cf8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								4e17ff9c82
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								9f95150a94
								
							
								
							
						 | 
						
							
							
								
								book appointment implementation completed.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								009fa1859e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								fdd5d4cf6d
								
							
								
							
						 | 
						
							
							
								
								fixes
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								21a9cc8c89
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								2aa84e0334
								
							
								
							
						 | 
						
							
							
								
								book appointment implementation contd.
							
							
							
							
							
						 | 
						
							2 months ago |