|  tahaalam | 90128a812b | call ambulance module design added. | 2 weeks ago | 
				
					
						|  tahaalam | c146747e5e | nearest er clinic repo viewmodel and view added | 3 weeks ago | 
				
					
						|  haroon amjad | d693850ef4 | ER services implementation contd. | 3 weeks ago | 
				
					
						|  tahaalam | ea92a0c75c | laser appointment screen added | 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 | 8166369f85 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart | 4 weeks ago | 
				
					
						|  tahaalam | 6ef9ae813d | doctors search filter added | 4 weeks ago | 
				
					
						|  haroon amjad | 3418480122 | Immediate LiveCare implementation completed | 4 weeks ago | 
				
					
						|  haroon amjad | 10b77206f6 | Immediate LiveCare consultation implementation contd. | 1 month ago | 
				
					
						|  haroon amjad | 2f4d6f5553 | immediate livecare consultation implementation contd. | 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 | 
				
					
						|  aamir-csol | 1335d3a7c8 | family screen & widgets | 1 month ago | 
				
					
						|  aamir-csol | 060e7a8d68 | Merge branch 'master' into dev_aamir | 1 month ago | 
				
					
						|  aamir-csol | 288a0018ce | family screen & widgets | 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 | a07369165d | Updates | 1 month ago | 
				
					
						|  haroon amjad | 344ecaba18 | LiveCare Schedule implementation done | 1 month ago | 
				
					
						|  aamir-csol | e5f4da4e16 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart | 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 | 6048b3b5f1 | Advance payment module implementation contd. | 1 month ago | 
				
					
						|  aamir-csol | a79dcad221 | family screen & widgets | 1 month ago | 
				
					
						|  Haroon Amjad | c9206f1ab8 | Radiology report implemented | 1 month ago | 
				
					
						|  Sikander Saleem | f04f3bcd9c | Merge branch 'refs/heads/master' into dev_sikander | 1 month ago | 
				
					
						|  Sikander Saleem | 8f0e910e4f | profile and settings ui completed. | 1 month 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 | 1 month ago | 
				
					
						|  taha.alam | 2174e0e292 | viewmodel and repo updated for the appointment by region selection. | 1 month ago | 
				
					
						|  Sultan khan | b78c78ed8b | no message | 2 months ago | 
				
					
						|  haroon amjad | 73f8baa77e | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/core/dependencies.dart
#	lib/extensions/string_extensions.dart
#	lib/widgets/input_widget.dart | 2 months ago | 
				
					
						|  Sikander Saleem | a25f42a43d | Merge branch 'refs/heads/master' into dev_sikander # Conflicts:
#	pubspec.yaml | 2 months ago | 
				
					
						|  Sikander Saleem | e17d207ce5 | swiper carousal view added in profile settings | 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 | 151351c0bf | medical file updates | 2 months ago | 
				
					
						|  Haroon Amjad | 5620cc4442 | medical file implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | 1de551e799 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  Sikander Saleem | f9859036ef | ui improvements. | 2 months ago | 
				
					
						|  haroon amjad | 01b6ab0e4b | habib wallet implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | 851bd569b4 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart | 2 months ago | 
				
					
						|  haroon amjad | e37eb78f81 | my appointments changes implementation contd. | 2 months ago | 
				
					
						|  Sikander Saleem | 60fe32131e | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago | 
				
					
						|  Sikander Saleem | d464721733 | merge conflict fixed. | 2 months ago | 
				
					
						|  Haroon Amjad | f7d62ed2e8 | my appointments implementation contd. | 2 months ago | 
				
					
						|  Sultan khan | 8511d0aa65 | no message | 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 | 
				
					
						|  Haroon Amjad | c27ba6ef09 | my appointments implementation contd. | 2 months ago | 
				
					
						|  haroon amjad | a0bdc34685 | My appointments implementation contd. | 2 months ago |