Commit Graph

14 Commits (3c438406b5915e2ebf084baf6b8fa43b311f5d24)

Author SHA1 Message Date
haroon amjad 5e8e3806d6 Covid Drive-Thru implemented 4 years ago
haroon amjad 83cca264f1 Merge branch 'LamaHerbish' into Haroon 4 years ago
HMG\Lama.Herbish 031be1ac56 fixes 4 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 6945230965 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/medical/smart_watch_health_data/health_data_list.dart
#	lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
haroon amjad b55681a056 Working on steps tracking 4 years ago
haroon amjad e495d3e5ad Health Data integration implementing 4 years ago
haroon amjad cf6686e413 Merge branch 'master' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 459ba828d9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/vital_sign/vital_sign_item.dart
	lib/routes.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
4 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 4 years ago
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 4 years ago
haroon amjad dfa7e0e02f updates & fixes 4 years ago
haroon amjad 0b6cd845f1 implementing Smart Watch Integration 4 years ago
haroon amjad 68b0e3857a updates 4 years ago