Commit Graph

609 Commits (34e8386ca1b69ed9f55b05d3af765bca948bbb2e)

Author SHA1 Message Date
Sultan khan 34e8386ca1 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan cc255e9c9a vital sign detail page 9 months ago
haroon amjad 1656ca58c1 Merge branch 'ambulance_service' into haroon_dev 9 months ago
haroon amjad 685eec6a52 updates & fixes 9 months ago
haroon amjad d6b1744176 updates 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
haroon amjad 255353dd21 Bottom nav updates 9 months ago
haroon amjad e9dd2f0648 updates 9 months ago
haroon amjad 210da3404c updates 9 months ago
haroon amjad 32ee47ca66 Merge branch 'master' into haroon_dev 9 months ago
Haroon6138 ba211ea4c2 Merge pull request 'hospital_filter' (#141) from hospital_filter into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/141
9 months ago
haroon amjad b10d715d55 App updates 9 months ago
tahaalam f19d06512a filters changed in region selection bottom sheet 9 months ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
haroon amjad 6f067d92d6 My invoices implemented 9 months ago
Sultan khan d62324044a default appointment load fix 9 months ago
Sultan khan dc8031bb41 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
  fixed the suggested design changes. (Not reminder ones)
  fixed the suggested design changes. (Not reminder ones)
9 months ago
Sultan khan f7021f685a no message 9 months ago
haroon amjad 93979707e4 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 213662e718 updates 9 months ago
faizatflutter 57f693e0d9 fixed the suggested design changes. (Not reminder ones) 9 months ago
faizatflutter 460e32d25a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
9 months ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 9 months ago
Haroon6138 06f6cb1514 Merge pull request 'dev_sultan' (#137) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/137
9 months ago
Sultan khan 0895d94df2 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan afe169d2d9 silent login fix 9 months ago
faizatflutter 40f6cafb48 fixed routing again and again. 9 months ago
faizatflutter 81e0680cb3 fixed routing again and again. 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
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
9 months ago
faizatflutter 0e2de5a55d Completed Graph 9 months ago
haroon amjad e9590a15d3 updates & fixes 9 months ago
haroon amjad 162337b317 Added appointment nearest gate & floor 9 months ago
faizatflutter d4dd475e0b Added Graph 9 months ago
Sultan khan d55fe5e527 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan 0e26505692 covid page inprogress 9 months ago
aamir-csol 6c1707128b Merge branch 'master' into dev_aamir 9 months ago
aamir-csol 3601e39a29 Health calculators & converters 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
10 months ago
Sultan khan 6ceee6973f 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:
  sickleave fix
  Health calculators & converters
  updates
  updates
  updates
  updates
  Nearest Appointment selected

# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
10 months ago
Sultan khan 873b2a1591 sorting done, covid inprogress 10 months ago
faizatflutter a1aaa041d1 Water Intake Final Touches 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
haroon amjad dcdd17f0e9 sickleave fix 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