|  Sikander Saleem | e17d207ce5 | swiper carousal view added in profile settings | 2 months ago | 
				
					
						|  Sikander Saleem | 50c3a8e595 | collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading | 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 | 
				
					
						|  Haroon Amjad | f7d62ed2e8 | my appointments implementation contd. | 2 months ago | 
				
					
						|  Haroon Amjad | 003a161b52 | custom chips implemented | 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 | 
				
					
						|  aamir-csol | 3db3966c06 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/core/app_state.dart | 2 months ago | 
				
					
						|  aamir-csol | 484ab56a8e | fixes for signup | 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 | a0bdc34685 | My appointments implementation contd. | 2 months ago | 
				
					
						|  faizatflutter | 702c504d4e | Merge branch 'refs/heads/master' into faiz_dev1 # Conflicts:
#	pubspec.yaml | 2 months ago | 
				
					
						|  faizatflutter | db50bd8f23 | Merge branch 'master' into faiz_dev1 # Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart | 2 months ago | 
				
					
						|  haroon amjad | 2d5f2b1deb | updates | 2 months ago | 
				
					
						|  Sikander Saleem | d385d0362f | merge changes | 2 months ago | 
				
					
						|  Sikander Saleem | 6473ccecb5 | Merge branch 'refs/heads/master' into dev_sikander # Conflicts:
#	lib/core/app_assets.dart | 2 months ago | 
				
					
						|  aamir-csol | c27d7301d9 | calender & signup fixes. | 2 months ago | 
				
					
						|  aamir-csol | da035650c0 | Merge branch 'master' into dev_aamir # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart | 2 months ago | 
				
					
						|  Sikander Saleem | 85bb00a8fc | Merge branch 'refs/heads/master' into dev_sikander | 2 months ago | 
				
					
						|  Sikander Saleem | 38d37fd407 | custom tab bar added. | 2 months ago | 
				
					
						|  faizatflutter | 3e50a3c89d | Merge branch 'dev_aamir' into faiz_dev1 # Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart | 2 months ago | 
				
					
						|  aamir-csol | 85fac13314 | changes | 2 months ago | 
				
					
						|  Sultan khan | 886825a4b9 | bottom navigation updated. | 2 months ago | 
				
					
						|  faizatflutter | 32fadb8ad9 | completed login function | 2 months ago | 
				
					
						|  aamir-csol | 7321da67e3 | register step 2 & fixes | 2 months ago | 
				
					
						|  aamir-csol | ed24365eff | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart | 2 months ago | 
				
					
						|  Haroon Amjad | f5e655fd35 | Lab order API implemented | 2 months ago | 
				
					
						|  aamir-csol | d1e1154bdb | changes | 2 months ago | 
				
					
						|  aamir-csol | 23a4035117 | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart | 2 months ago | 
				
					
						|  aamir-csol | 67e580447e | changes | 2 months ago | 
				
					
						|  faizatflutter | 9509d4a192 | completed the deviceapi with new architecture | 2 months ago | 
				
					
						|  aamir-csol | 8f1e4500cc | register & Exception bottom sheet, country dropdown. | 2 months ago | 
				
					
						|  aamir-csol | 5e292544d7 | Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir # Conflicts:
#	lib/main.dart
#	lib/presentation/authentication/register.dart
#	lib/providers/authentication_view_model.dart | 2 months ago | 
				
					
						|  faizatflutter | e2b0930dd1 | Merge branch 'master' into faiz_dev1 # Conflicts:
#	ios/Podfile.lock
#	lib/core/app_state.dart
#	lib/main.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/home/landing_page.dart
#	pubspec.yaml | 2 months ago | 
				
					
						|  aamir-csol | 6f98690929 | register & changes | 2 months ago | 
				
					
						|  Haroon Amjad | 0a39a00df5 | Landing page updates | 2 months ago | 
				
					
						|  Sultan khan | cbfb381615 | Merge branch 'faiz_dev' into faiz_dev1 # Conflicts:
#	ios/Podfile.lock
#	lib/main.dart
#	lib/routes/app_routes.dart
#	pubspec.lock | 2 months ago | 
				
					
						|  aamir-csol | 4d76b34608 | app bar & chip | 2 months ago | 
				
					
						|  aamir-csol | 4e3ba99280 | widgets & fixes | 2 months ago | 
				
					
						|  Faiz Hashmi | d65dc4ea89 | initial commit | 2 months ago | 
				
					
						|  Haroon Amjad | c65d44ae4d | updates | 2 months ago | 
				
					
						|  Haroon Amjad | b6766654e0 | initial commit | 2 months ago |