|  aamir-csol | d918b6e464 | family screen & widgets | 4 weeks 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 | 
				
					
						|  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 | 
				
					
						|  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 | 
				
					
						|  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 | 
				
					
						|  aamir-csol | 36193d349c | Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir # Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart | 1 month ago | 
				
					
						|  aamir-csol | 02433e1bef | family screen & widgets | 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 | a07369165d | Updates | 1 month ago | 
				
					
						|  Sultan khan | 318441c77f | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 1 month ago | 
				
					
						|  aamir-csol | 45a1ce9254 | Merge branch 'master' into dev_aamir | 1 month ago | 
				
					
						|  haroon amjad | f7e26da6f4 | Merge branch 'master' into haroon_dev | 1 month ago | 
				
					
						|  haroon amjad | 344ecaba18 | LiveCare Schedule implementation done | 1 month ago | 
				
					
						|  Sultan khan | 3642523fdf | Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan # Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart | 1 month ago | 
				
					
						|  Sikander Saleem | 604e503e52 | flow improvement & translation added. | 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 | 
				
					
						|  aamir-csol | 192d617350 | family screen & widgets | 1 month ago | 
				
					
						|  aamir-csol | e48e98d61b | Merge branch 'master' into dev_aamir | 1 month ago | 
				
					
						|  Sultan khan | 32c7608c83 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 1 month ago | 
				
					
						|  Sultan khan | 6d85227f11 | lab order by test | 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 | 
				
					
						|  Sikander Saleem | 005157fe5e | Merge branch 'refs/heads/master' into dev_sikander # Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart | 1 month ago | 
				
					
						|  aamir-csol | 1125437a56 | family screen & widgets | 1 month ago | 
				
					
						|  Sikander Saleem | 12cef74f16 | splash animation added. | 1 month ago | 
				
					
						|  Sultan khan | 3d1d78ba48 | Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan | 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 | 97038f1a25 | advance payment implementation done for self & other file number | 1 month ago | 
				
					
						|  aamir-csol | f9bfc131a8 | family screen & widgets | 1 month ago | 
				
					
						|  Haroon Amjad | 1c2564a1e2 | updates | 1 month ago | 
				
					
						|  haroon amjad | 6048b3b5f1 | Advance payment module implementation contd. | 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 | 
				
					
						|  Haroon Amjad | a4854bbe4a | Habib Wallet updates | 1 month ago | 
				
					
						|  Haroon6138 | 25f0b9d415 | Merge pull request 'haroon_dev' (#49) from haroon_dev into master Reviewed-on: #49 | 1 month ago | 
				
					
						|  Haroon Amjad | bdde6c224d | Merge branch 'master' into haroon_dev | 1 month ago | 
				
					
						|  Haroon6138 | 5e82e02323 | Merge pull request 'Location functionality' (#48) from functionality/location into master Reviewed-on: #48 | 1 month ago |