|  aamir-csol | 192d617350 | family screen & widgets | 1 month ago | 
				
					
						|  aamir-csol | e48e98d61b | Merge branch 'master' into dev_aamir | 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 | 
				
					
						|  aamir-csol | e5f4da4e16 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart | 1 month ago | 
				
					
						|  aamir-csol | 1125437a56 | family screen & widgets | 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 | 
				
					
						|  aamir-csol | f9bfc131a8 | family screen & widgets | 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 | 1 month ago | 
				
					
						|  Sultan khan | 0a653a61f2 | family file bottomsheet added | 1 month ago | 
				
					
						|  aamir-csol | 17c47d093c | otp screen & register Uae & resend Activation Code. | 1 month ago | 
				
					
						|  Sikander Saleem | bb0ac4a0fe | Merge branch 'refs/heads/master' into dev_sikander | 1 month ago | 
				
					
						|  Sikander Saleem | c96081d07c | reverse animation time changed to 500ms. | 1 month ago | 
				
					
						|  Sultan khan | 030c2a1b8a | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 1 month ago | 
				
					
						|  Sultan khan | eafb52ab86 | family file work in-progress | 1 month ago | 
				
					
						|  Sikander Saleem | 57827549b8 | language switch added in drawer, and ui improvements | 1 month ago | 
				
					
						|  aamir-csol | 2b7656d83a | otp screen & register Uae & resend Activation Code. | 1 month ago | 
				
					
						|  aamir-csol | 3ddd7781cd | Merge branch 'master' into dev_aamir | 1 month ago | 
				
					
						|  Sikander Saleem | f04f3bcd9c | Merge branch 'refs/heads/master' into dev_sikander | 1 month ago | 
				
					
						|  Sikander Saleem | c00e69ef0c | profile wallet linked with view model. | 1 month ago | 
				
					
						|  taha.alam | 55c51f5742 | Merge remote-tracking branch 'origin/master' into feature/search_by_region | 1 month ago | 
				
					
						|  taha.alam | 033ae12499 | api handling for clinic and doctor parameters and state management | 1 month ago | 
				
					
						|  aamir-csol | 3b1b51ef6f | otp screen & register Uae & resend Activation Code. | 1 month ago | 
				
					
						|  Sikander Saleem | 8f0e910e4f | profile and settings ui completed. | 1 month ago | 
				
					
						|  aamir-csol | 5de8314f3f | otp screen & register Uae & resend Activation Code. | 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 | 
				
					
						|  taha.alam | 9c2dd721b4 | bottom sheets added of region facitlity and hospital. | 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 | 
				
					
						|  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 | 
				
					
						|  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 | 6f745f3666 | calendar implementation contd. | 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 | 
				
					
						|  aamir-csol | 6a09c2ec07 | validations & otp widget & focus & auto fill | 2 months ago | 
				
					
						|  haroon amjad | 3066bc8ea3 | Book appointment implementation contd. | 2 months ago | 
				
					
						|  aamir-csol | b7e19a0af8 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/features/authentication/authentication_view_model.dart | 2 months ago | 
				
					
						|  aamir-csol | 0c58c22ea5 | sign | 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 | 
				
					
						|  Sultan khan | 138862b115 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 2 months ago | 
				
					
						|  Sultan khan | 299c0b0e29 | login flow complete | 2 months ago | 
				
					
						|  haroon amjad | 8df38ea6d1 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/extensions/widget_extensions.dart | 2 months ago | 
				
					
						|  haroon amjad | ccd29f0cf9 | updates | 2 months ago | 
				
					
						|  Sikander Saleem | 09e92b8649 | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago |