haroon amjad
							
						 | 
						
							
							
							
							
								
							
								415c0eb3c7
								
							
								
							
						 | 
						
							
							
								
								Dental appointment booking implementation contd.
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								3418480122
								
							
								
							
						 | 
						
							
							
								
								Immediate LiveCare implementation completed
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								10b77206f6
								
							
								
							
						 | 
						
							
							
								
								Immediate LiveCare consultation implementation contd.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								6b28b57307
								
							
								
							
						 | 
						
							
							
								
								empty state implementation contd.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								62e82a7a31
								
							
								
							
						 | 
						
							
							
								
								Empty data state implementation contd.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a07369165d
								
							
								
							
						 | 
						
							
							
								
								Updates
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								604e503e52
								
							
								
							
						 | 
						
							
							
								
								flow improvement & translation added.
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								3b5d2d27a4
								
							
								
							
						 | 
						
							
							
								
								Updates
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								bb0ac4a0fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 Haroon6138
							
						 | 
						
							
							
							
							
								
							
								bfdc9752ae
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'dev_aamir' (#45) from dev_aamir into master
							
							
							
							
							
							
							
							Reviewed-on: #45 
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								taha.alam
							
						 | 
						
							
							
							
							
								
							
								265d979b48
								
							
								
							
						 | 
						
							
							
								
								drilled the lat and lng parameter form viewmodel to the mapper
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								21a9cc8c89
								
							
								
							
						 | 
						
							
							
								
								otp screen & register Uae & resend Activation Code.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								6a09c2ec07
								
							
								
							
						 | 
						
							
							
								
								validations & otp widget & focus & auto fill
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								7b94199d58
								
							
								
							
						 | 
						
							
							
								
								Medical report implementation done, Book Appointment implementation contd.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								de717edfe8
								
							
								
							
						 | 
						
							
							
								
								Sickleave implementation done.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								7c8d7b67a9
								
							
								
							
						 | 
						
							
							
								
								signup finalize
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								d87562caf5
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								3a649bca35
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								8c55064158
								
							
								
							
						 | 
						
							
							
								
								signup completed
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								ccd29f0cf9
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								7dcc827721
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/features/authentication/authentication_view_model.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								cd48d83c07
								
							
								
							
						 | 
						
							
							
								
								signup
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								6b2ec5aa2c
								
							
								
							
						 | 
						
							
							
								
								updates, fixes & service privileges
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								255b3c1565
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into haroon_dev
							
							
							
							
							
							
							
							# Conflicts:
#	lib/features/authentication/authentication_view_model.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 Haroon6138
							
						 | 
						
							
							
							
							
								
							
								0e76e95636
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'dev_sultan' (#20) from dev_sultan into master
							
							
							
							
							
							
							
							Reviewed-on: #20 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								2a081e30b5
								
							
								
							
						 | 
						
							
							
								
								saved login done.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								b10523dac3
								
							
								
							
						 | 
						
							
							
								
								Online CheckIn implementation contd.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								c129eb2c2f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								9b063ba764
								
							
								
							
						 | 
						
							
							
								
								fixes for signup
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								7cc12bd1cf
								
							
								
							
						 | 
						
							
							
								
								prescription calender reminder added.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								60fe32131e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								dfe02917fc
								
							
								
							
						 | 
						
							
							
								
								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 | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0ce43fde5f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/master' into dev_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								cb4601050c
								
							
								
							
						 | 
						
							
							
								
								prescription reminder bottom sheet added.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								542de41a82
								
							
								
							
						 | 
						
							
							
								
								updates & fixes
							
							
							
							
							
						 | 
						
							2 months ago |