Commit Graph

297 Commits (471376305a6c94deffb229b43296c5dc63ac4319)

Author SHA1 Message Date
tahaalam 04d14a4d82 langauge regarding changes 7 months ago
tahaalam fcf990bc00 hot fixes 7 months ago
haroon amjad be08c3f228 updates 7 months ago
haroon amjad 86fa198afc Updates & fixes 7 months ago
Sultan khan 5989dda613 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  QLine API changes handled
7 months ago
Sultan khan 21c7b05df9 no message 7 months ago
haroon amjad 0566685e48 QLine API changes handled 7 months ago
Sultan khan 21ae30a8cc profile picture upload 7 months ago
Sultan khan 5f559a44dd profile image upload 7 months ago
haroon amjad 6a687f4ff6 Updates & fixes 7 months ago
haroon amjad 5b44329972 updates 7 months ago
haroon amjad ad0cbe1e21 updates 7 months ago
Sultan khan 3d1c415e2c my invoice updated 7 months ago
Sultan khan 6d647d75be Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Updates
  radiology ai lab analysis & lab ai analysis api end points updates.
  Updates
  updates
  updates

# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
7 months ago
Sultan khan 712e835176 ui fixes 7 months ago
haroon amjad fe1e0fdb40 Updates 7 months ago
haroon amjad 572c37785b updates 7 months ago
haroon amjad 991f9c7a9b Pull to refresh implemented 7 months ago
haroon amjad e3f5bb69ac Updates 7 months ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 7 months ago
haroon amjad 453cfc07e1 Updates 7 months ago
haroon amjad 1fa03fff5e updates 7 months ago
haroon amjad f929bd9017 Updates 7 months ago
haroon amjad a8620c1f72 updates 7 months ago
haroon amjad 4959392f74 Updates 7 months ago
haroon amjad f7446d0d41 updates 7 months ago
haroon amjad 3703afe8bd updates 7 months ago
haroon amjad edeae70aa0 Updates 7 months ago
haroon amjad deca29b423 updates & fixes 7 months ago
haroon amjad 93af246700 updates 7 months ago
haroon amjad a13d0cf0e4 updates 7 months ago
haroon amjad 837a934d0d updates 7 months ago
haroon amjad 841fca027c updates 7 months ago
haroon amjad 7611c1d58c Updates 7 months ago
haroon amjad 4a3d66f01a Updates 7 months ago
haroon amjad 0ed6103b15 updates 7 months ago
haroon amjad d053f58b7d Updates 7 months ago
haroon amjad d703c382e5 Updates 7 months ago
haroon amjad 3d877ed28d Updates 7 months ago
Haroon Amjad 55b8bc162c Updates 7 months ago
Haroon Amjad 30bdfac442 App update page updates 8 months ago
Sultan khan 4f303d8496 other country login done. 8 months ago
Haroon Amjad 8de8039096 updates 8 months ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 8 months ago
haroon amjad f46b3f745f Dark mode enabled 8 months ago
Haroon Amjad 105ab2326a updates 8 months ago
haroon amjad 05b6d02e4c Updates & fixes 8 months ago
haroon amjad 8309f311e6 App update page implemented 9 months ago
Haroon Amjad 9b3c172dd1 updates 9 months ago
Haroon Amjad 23abbebf9e arabic fixes 9 months ago
haroon amjad 70a6d90ce3 updates & fixes 9 months ago
haroon amjad cfd0c16738 updates & fixes 9 months ago
Haroon Amjad 49542a9112 updates & fixes 9 months ago
Haroon Amjad 1ae1212733 Merge branch 'master' into haroon_dev 9 months ago
Haroon Amjad 537d93915e Zoom SDK fixes 9 months ago
Sikander Saleem b9350afead ui improvements 9 months ago
faizatflutter 9c7cfde5f4 ui improvements 9 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 9 months ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
9 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 b0708d85d9 updates & fixes 9 months ago
haroon amjad 7ead6d79e5 updates 9 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 9 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 9 months ago
haroon amjad f54ce71177 translation changes 9 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 9 months ago
haroon amjad 6faca94b89 updates 9 months ago
haroon amjad 99282f34e3 Added language change option in landing page 9 months ago
haroon amjad 9ef70a250d translation updates 9 months ago
Sikander Saleem 40ba1bd246 ui improvements 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 3ff9628cd3 Translation updates 9 months ago
haroon amjad 87422e8e05 translation updates 10 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 10 months ago
haroon amjad 609ae6ab83 updates 10 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
10 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
10 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
10 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
10 months ago
haroon amjad 1c0842ab95 updates 10 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 10 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 10 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
10 months ago
haroon amjad 1656ca58c1 Merge branch 'ambulance_service' into haroon_dev 10 months ago
haroon amjad d6b1744176 updates 10 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
10 months ago
haroon amjad 210da3404c updates 10 months ago
haroon amjad b10d715d55 App updates 10 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
10 months ago
haroon amjad b353de3cf8 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_doctor_page.dart
#	lib/presentation/book_appointment/widgets/doctor_card.dart
10 months ago
aamir-csol 54f8391066 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
10 months ago
aamir-csol 135b05e561 Health calculators & converters 10 months ago
haroon amjad 510d82b592 Merge branch 'master' into haroon_dev 10 months ago
Sultan khan 366429f083 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Health calculators & converters
  Health calculators & converters
  collapsing_list_view improvement

# Conflicts:
#	lib/widgets/appbar/collapsing_list_view.dart
10 months ago
haroon amjad f886357bcd updates 10 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
10 months ago
Sultan khan 40638cfec4 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  collapsing_list_view improvement
  Updated design for HHC
  updates & fixes
  QLine API implementation enhancements
  LiveCare flow from clinic selection implemented

# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago
aamir-csol c921228ad9 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/health_calculators/health_calculator_result.dart
10 months ago
aamir-csol f509a09b34 Health calculators & converters 10 months ago
haroon amjad 450f07d39d updates & fixes 10 months ago