Commit Graph

26 Commits (475a9b9acb47c2fe1f93f386536a6f89d69d9c4e)

Author SHA1 Message Date
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
1 week ago
Sultan khan f7021f685a no message 2 weeks ago
Sultan khan afe169d2d9 silent login fix 2 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
2 weeks ago
Sultan khan 0e26505692 covid page inprogress 2 weeks 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
2 weeks ago
Sultan khan 873b2a1591 sorting done, covid inprogress 2 weeks ago
aamir-csol 135b05e561 Health calculators & converters 3 weeks 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
3 weeks ago
faizatflutter 94668997aa Updated design for HHC 1 month ago
Fatimah.Alshammari c9de23347a fix error 1 month 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
1 month ago
Fatimah.Alshammari 0b3fea230f monthly report 1 month ago
haroon amjad a83a35a284 Services Page Revamp 1 month ago
Sultan khan 9e0336687c virtual tour. 2 months ago
Sultan khan fb69723a65 e-referral done. 2 months ago
Sultan khan 5f047e1b6f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/hmg_services/hmg_services_repo.dart
#	lib/features/hmg_services/hmg_services_view_model.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart
2 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 2 months ago
faizatflutter fe00447483 HHC in Progress 2 months ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 2 months ago
faizatflutter da579dfd09 CMC Module Completed 2 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 2 months ago
Sultan khan 9a04974db3 Merge branch 'faiz_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
2 months ago
Sultan khan c43f96c619 e-referral work in progress 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
Sultan khan 171bd644d1 e-referral work in progress. 2 months ago