Commit Graph

31 Commits (f19d06512aae7a8d8ddc2290b8a79f6dfdbeb413)

Author SHA1 Message Date
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
Sultan khan afe169d2d9 silent login fix 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 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
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
9 months ago
Sultan khan 873b2a1591 sorting done, covid inprogress 9 months ago
haroon amjad 3cc2610d30 updates 9 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 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
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 10 months ago
haroon amjad 3060c57201 updates 10 months ago
haroon amjad f1004f39af Merge branch 'master' into haroon_dev 10 months ago
aamir-csol 7d71d994ea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/enums.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/routes/app_routes.dart
10 months ago
aamir-csol 335e6a6649 Health Calculators 10 months ago
haroon amjad eff6cbbaad updates & fixes 10 months ago
haroon amjad d202aa8423 Smartwatch integration started 10 months ago
faizatflutter 449c338c46 refactor 10 months ago
faizatflutter 5fd1905d8c Complete UserInfo Selection Module 10 months ago
haroon amjad a83a35a284 Services Page Revamp 10 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 10 months ago
Sultan khan 9e0336687c virtual tour. 11 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
11 months ago
faizatflutter fe00447483 HHC in Progress 11 months ago
haroon amjad b13adde9d2 send feedback implementation done 11 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 11 months ago
Sultan khan 171bd644d1 e-referral work in progress. 11 months ago
haroon amjad d693850ef4 ER services implementation contd. 1 year ago