Commit Graph

195 Commits (63cdced84ec5651127310bd0e0a9e7ccb739bfe3)

Author SHA1 Message Date
Haroon Amjad 49542a9112 updates & fixes 6 days ago
Haroon Amjad 1ae1212733 Merge branch 'master' into haroon_dev 6 days ago
Haroon Amjad 537d93915e Zoom SDK fixes 6 days ago
Sikander Saleem b9350afead ui improvements 7 days ago
faizatflutter 9c7cfde5f4 ui improvements 1 week ago
Sikander Saleem 6e1eb0d0bb ui improvements 1 week ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
2 weeks 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
2 weeks ago
haroon amjad b0708d85d9 updates & fixes 2 weeks ago
haroon amjad 7ead6d79e5 updates 2 weeks ago
haroon amjad 10a5a6f558 Ask Doctor implemented 2 weeks ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad f54ce71177 translation changes 2 weeks ago
faizatflutter 07447e148b Symptoms Checker flow is completed 2 weeks ago
haroon amjad 6faca94b89 updates 2 weeks ago
haroon amjad 99282f34e3 Added language change option in landing page 2 weeks ago
haroon amjad 9ef70a250d translation updates 2 weeks ago
Sikander Saleem 40ba1bd246 ui improvements 2 weeks 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
2 weeks ago
haroon amjad 3ff9628cd3 Translation updates 3 weeks ago
haroon amjad 87422e8e05 translation updates 3 weeks ago
Sikander Saleem 77a04e637e UI/UX improvements. 3 weeks ago
haroon amjad 609ae6ab83 updates 3 weeks 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
3 weeks 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
3 weeks ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
3 weeks ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
3 weeks ago
haroon amjad 1c0842ab95 updates 3 weeks ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 3 weeks ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 4 weeks 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
4 weeks ago
haroon amjad 1656ca58c1 Merge branch 'ambulance_service' into haroon_dev 4 weeks ago
haroon amjad d6b1744176 updates 4 weeks 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
4 weeks ago
haroon amjad 210da3404c updates 4 weeks ago
haroon amjad b10d715d55 App updates 4 weeks 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
1 month 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
1 month ago
aamir-csol 54f8391066 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
1 month ago
aamir-csol 135b05e561 Health calculators & converters 1 month ago
haroon amjad 510d82b592 Merge branch 'master' into haroon_dev 1 month 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
1 month ago
haroon amjad f886357bcd updates 1 month 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
1 month 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
1 month 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
2 months ago
aamir-csol f509a09b34 Health calculators & converters 2 months ago
haroon amjad 450f07d39d updates & fixes 2 months ago
haroon amjad d8c7503c56 QLine API implementation enhancements 2 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
2 months ago