tahaalam
							
						 | 
						
							
							
							
							
								
							
								47d158c1e2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								c146747e5e
								
							
								
							
						 | 
						
							
							
								
								nearest er clinic repo viewmodel and view added
							
							
							
							
							
						 | 
						
							3 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								d9796154dc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into laser_appointment
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart 
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								0441d072fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart 
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								d693850ef4
								
							
								
							
						 | 
						
							
							
								
								ER services implementation contd.
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								baf7cf0ea0
								
							
								
							
						 | 
						
							
							
								
								dental routing fixed and laser exception removed
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								9e3035f02b
								
							
								
							
						 | 
						
							
							
								
								units added to lab result and it graph and unwanted values removed from graph
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								e1ac77855c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								ea92a0c75c
								
							
								
							
						 | 
						
							
							
								
								laser appointment screen added
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								663eda0076
								
							
								
							
						 | 
						
							
							
								
								updates & fixes
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								b27e3268b1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart 
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								25fa1acc9e
								
							
								
							
						 | 
						
							
							
								
								Medical file widgets, Insurance approval implementation contd.
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								24362f67cb
								
							
								
							
						 | 
						
							
							
								
								family screen & widgets
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								aaa8222b1a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart 
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								d918b6e464
								
							
								
							
						 | 
						
							
							
								
								family screen & widgets
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 Haroon6138
							
						 | 
						
							
							
							
							
								
							
								3bbc014251
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'appointment date filter handled' (#74) from appointment_filter into master
							
							
							
							
							
							
							
							Reviewed-on: #74 
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								61007302c9
								
							
								
							
						 | 
						
							
							
								
								appointment date filter handled
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								e5dcabacce
								
							
								
							
						 | 
						
							
							
								
								lab prescription details are added andgraph visibility added to the graph page for result that are IRR
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c0606fb530
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
							
							
							# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/lab/lab_orders_page.dart 
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								483a1571d9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into appointment_filter
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart 
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								6cf08c04d2
								
							
								
							
						 | 
						
							
							
								
								appointment filters added.
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								3d64ddf78b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								db979977ca
								
							
								
							
						 | 
						
							
							
								
								Tamara implementation & enhancements
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								641df8b51b
								
							
								
							
						 | 
						
							
							
								
								logs  removed
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								36bf229787
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature/lab_result
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart 
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 tahaalam
							
						 | 
						
							
							
							
							
								
							
								da89c41925
								
							
								
							
						 | 
						
							
							
								
								lab result by hospital and translations are added
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								093e645f60
								
							
								
							
						 | 
						
							
							
								
								request medical report implementation completed.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								e5488299b8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart 
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								060e7a8d68
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								9b33745a57
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								192d617350
								
							
								
							
						 | 
						
							
							
								
								family screen & widgets
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								e48e98d61b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
						 | 
						
							1 month ago |