34 Commits (f340f4fb8f9645dc81a97a3be7fe07051af8ea7b)

Author	SHA1	Message	Date
aamir-csol	7014ac397e	Merge remote-tracking branch 'origin/master' into dev_aamir ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart	6 months ago
aamir-csol	2c2cb8bb99	family file button fix	6 months ago
aamir-csol	8c7f4afe76	family file button fix	6 months ago
haroon amjad	940ce5ff14	updates	6 months ago
aamir-csol	bb4719bd87	logout & family file fix & PMA-1047	6 months ago
haroon amjad	3ff9628cd3	Translation updates	7 months ago
aamir-csol	135b05e561	Health calculators & converters	7 months ago
faizatflutter	34f4cd4f91	Merge branch 'refs/heads/master' into faiz_dev ... # Conflicts: # lib/core/dependencies.dart # lib/main.dart # lib/presentation/home/landing_page.dart # lib/presentation/medical_file/medical_file_page.dart # lib/routes/app_routes.dart # lib/widgets/appbar/collapsing_list_view.dart	8 months ago
aamir-csol	0f17a655ed	Merge branch 'master' into dev_aamir ... # Conflicts: # ios/Runner/AppDelegate.swift # lib/core/dependencies.dart # lib/core/utils/utils.dart # lib/features/emergency_services/emergency_services_view_model.dart # lib/presentation/authentication/quick_login.dart # lib/presentation/emergency_services/RRT/rrt_request_type_select.dart # lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart # lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart # lib/presentation/emergency_services/call_ambulance/tracking_screen.dart # lib/presentation/emergency_services/emergency_services_page.dart # lib/presentation/medical_file/medical_file_page.dart # lib/presentation/my_family/widget/family_cards.dart # lib/widgets/appbar/collapsing_list_view.dart # lib/widgets/common_bottom_sheet.dart	8 months ago
faizatflutter	757ace2ba1	Added Organ Selector	8 months ago
haroon amjad	d3a8d545b2	Merge branch 'master' into haroon_dev ... # Conflicts: # lib/presentation/medical_file/medical_file_page.dart # lib/presentation/my_family/widget/family_cards.dart	9 months ago
haroon amjad	8dcc8dfbe3	updates	9 months ago
faizatflutter	f96f3e563c	Fixed App CustomChip	9 months ago
haroon amjad	2160f87c59	updates	9 months ago
aamir-csol	e113c4c1ee	updates & fixes & RRT Flow	9 months ago
aamir-csol	987fe73128	family screen add fixes & remove & switch & widgets	10 months ago
aamir-csol	02ae79c458	Merge branch 'refs/heads/master' into dev_aamir	10 months ago
faizatflutter	72d765e508	Design Updates	10 months ago
aamir-csol	cd81372fc6	family screen add fixes & remove & switch & widgets	10 months ago
aamir-csol	bf8f98ffb1	family screen add fixes & remove & switch & widgets	10 months ago
haroon amjad	b27e3268b1	Merge branch 'master' into haroon_dev ... # Conflicts: # lib/presentation/home/landing_page.dart # lib/presentation/medical_file/medical_file_page.dart # lib/widgets/chip/app_custom_chip_widget.dart	10 months ago
aamir-csol	24362f67cb	family screen & widgets	10 months ago
aamir-csol	d918b6e464	family screen & widgets	10 months 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	10 months ago
aamir-csol	1335d3a7c8	family screen & widgets	10 months ago
aamir-csol	288a0018ce	family screen & widgets	10 months 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	10 months ago
aamir-csol	02433e1bef	family screen & widgets	10 months ago
faizatflutter	94313b8870	Improved Error Handling	10 months ago
Sultan khan	3acd549de7	no message	10 months ago
aamir-csol	192d617350	family screen & widgets	10 months ago
aamir-csol	1125437a56	family screen & widgets	11 months ago
aamir-csol	f9bfc131a8	family screen & widgets	11 months ago
aamir-csol	a79dcad221	family screen & widgets	11 months ago