|  aamir-csol | 24362f67cb | family screen & widgets | 3 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 | 
				
					
						|  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 | 6cf08c04d2 | appointment filters added. | 4 weeks ago | 
				
					
						|  haroon amjad | 415c0eb3c7 | Dental appointment booking implementation contd. | 4 weeks ago | 
				
					
						|  haroon amjad | db979977ca | Tamara implementation & enhancements | 4 weeks ago | 
				
					
						|  haroon amjad | 5e000db556 | updates | 4 weeks ago | 
				
					
						|  haroon amjad | 8a7f46441c | updates | 4 weeks ago | 
				
					
						|  haroon amjad | 3418480122 | Immediate LiveCare implementation completed | 4 weeks ago | 
				
					
						|  haroon amjad | 1af2db5c09 | patient profile settings page integration implementation contd. | 1 month ago | 
				
					
						|  haroon amjad | 5f43063f2d | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/core/app_assets.dart | 1 month ago | 
				
					
						|  haroon amjad | 6b28b57307 | empty state implementation contd. | 1 month ago | 
				
					
						|  tahaalam | 512628fb8b | Lab result view along with the listing of  items is added | 1 month ago | 
				
					
						|  haroon amjad | a07369165d | Updates | 1 month ago | 
				
					
						|  haroon amjad | a711d3a6dd | LiveCare shcedule implementation contd. | 1 month ago | 
				
					
						|  Haroon6138 | 25f0b9d415 | Merge pull request 'haroon_dev' (#49) from haroon_dev into master Reviewed-on: #49 | 1 month ago | 
				
					
						|  Haroon Amjad | c9206f1ab8 | Radiology report implemented | 1 month ago | 
				
					
						|  haroon amjad | 3b5d2d27a4 | Updates | 1 month ago | 
				
					
						|  Sikander Saleem | 99e1036043 | ui improvement. | 1 month ago | 
				
					
						|  haroon amjad | 4f4bef9d6f | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/presentation/home/landing_page.dart | 1 month ago | 
				
					
						|  haroon amjad | 5e81ba1ed8 | updates | 1 month ago | 
				
					
						|  Sikander Saleem | 3267317457 | Merge branch 'refs/heads/master' into dev_sikander # Conflicts:
#	lib/presentation/home/landing_page.dart | 1 month ago | 
				
					
						|  Sikander Saleem | 57827549b8 | language switch added in drawer, and ui improvements | 1 month ago | 
				
					
						|  haroon amjad | c191fd0be1 | updates | 1 month ago | 
				
					
						|  Sikander Saleem | c00e69ef0c | profile wallet linked with view model. | 1 month ago | 
				
					
						|  Sikander Saleem | c83754fc4a | user profile welcome widget improvement. | 1 month 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 | 
				
					
						|  haroon amjad | 9f95150a94 | book appointment implementation completed. | 2 months ago | 
				
					
						|  Sultan khan | fdd5d4cf6d | fixes | 2 months ago | 
				
					
						|  haroon amjad | 3066bc8ea3 | Book appointment implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | 7b94199d58 | Medical report implementation done, Book Appointment implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | b240293064 | medical file implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | 5620cc4442 | medical file implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | f812dac059 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart | 2 months ago | 
				
					
						|  haroon amjad | 4269e99be9 | updates | 2 months ago | 
				
					
						|  Sultan khan | 299c0b0e29 | login flow complete | 2 months ago | 
				
					
						|  haroon amjad | ccd29f0cf9 | updates | 2 months ago | 
				
					
						|  Sultan khan | 58d33e2dae | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart | 2 months ago | 
				
					
						|  Sultan khan | 1466b6b71a | no message | 2 months ago | 
				
					
						|  Haroon Amjad | 6b2ec5aa2c | updates, fixes & service privileges | 2 months ago | 
				
					
						|  Sultan khan | 2a081e30b5 | saved login done. | 2 months ago | 
				
					
						|  Sultan khan | b4667f5c94 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  Sultan khan | 075578602e | Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  Sultan khan | a199ca040b | quick login inprogress | 2 months ago | 
				
					
						|  aamir-csol | 9b063ba764 | fixes for signup | 2 months ago | 
				
					
						|  haroon amjad | f8be788a60 | updates & fixes | 2 months ago | 
				
					
						|  haroon amjad | 542de41a82 | updates & fixes | 2 months ago | 
				
					
						|  Sultan khan | 384ac814f8 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart | 2 months ago | 
				
					
						|  Sultan khan | ba2c8327fe | login flow inprogress | 2 months ago |