Commit Graph

185 Commits (dc0e4e5eb65d964bfcd3abce735a6186e6fe75d7)

Author SHA1 Message Date
haroon amjad 9413e54d3a NPHIES Eligibility checks implemented 8 months ago
haroon amjad ec506869cc Android package name updated to new package details 8 months ago
haroon amjad 4b710523e8 Feedback status implemented 8 months ago
haroon amjad 2be65cba51 Inactive Insurance case handled 8 months ago
haroon amjad 5015747580 LiveCare changes 8 months ago
haroon amjad 01c21377aa Updates & fixes 8 months ago
Haroon Amjad a4573c8710 arabic fixes 8 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 8 months ago
Haroon Amjad eeaa22357f Date format changed to en-US 8 months ago
haroon amjad f09d478a03 iOS BundleID changes 8 months ago
haroon amjad 3af43dc676 JIRA bug fixes & updates 8 months ago
haroon amjad 85ccf41d04 Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare 8 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 8 months ago
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
9 months ago
haroon amjad f54ce71177 translation changes 9 months ago
Sikander Saleem e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
9 months ago
haroon amjad 5feacfaf27 Translation updates 9 months ago
haroon amjad 3ff9628cd3 Translation updates 9 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 9 months ago
haroon amjad 344adf23c0 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
9 months ago
haroon amjad 44ce353dac updates 9 months ago
Fatimah.Alshammari 250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
9 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
9 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
9 months ago
haroon amjad 1c0842ab95 updates 9 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 9 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 9 months ago
Fatimah.Alshammari 20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
9 months ago
haroon amjad 685eec6a52 updates & fixes 9 months ago
tahaalam 699ef2f672 Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
#	android/settings.gradle.kts
9 months ago
tahaalam 85f9609cbb Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
#	android/app/libs/PenNavUI.aar
#	android/app/libs/Penguin.aar
#	android/app/libs/PenguinRenderer.aar
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
#	android/build/reports/problems/problems-report.html
#	ios/Runner/AppDelegate.swift
9 months ago
haroon amjad ede8844f19 Monthly Reports implemented 9 months ago
faizatflutter 17f32e34d3 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/presentation/symptoms_checker/user_info_selection.dart
9 months ago
tahaalam f19d06512a filters changed in region selection bottom sheet 9 months ago
faizatflutter 49d091547a Till Triage Completed 9 months ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
9 months ago
Fatimah.Alshammari 11de01e079 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
9 months ago
faizatflutter d4dd475e0b Added Graph 9 months ago
Sultan khan 0e26505692 covid page inprogress 9 months ago
faizatflutter 333046951c Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/routes/app_routes.dart
9 months ago
faizatflutter a1aaa041d1 Water Intake Final Touches 9 months ago
aamir-csol 135b05e561 Health calculators & converters 9 months ago
Fatimah.Alshammari f3674ba06f Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
9 months ago
haroon amjad 575a534f5e PenguinIn fixes 10 months ago
haroon amjad d8c7503c56 QLine API implementation enhancements 10 months ago
Fatimah.Alshammari c9de23347a fix error 10 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
10 months ago
haroon amjad 3060c57201 updates 10 months ago
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
10 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago