You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
HMG_Patient_App_New/lib/core
Sultan khan 70d5b06987 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: (45 commits)
  Health Calculators
  Smartwatch integration started
  refactor
  Complete UserInfo Selection Module
  Complete UserInfo Selection Module
  update
  Complete USerInfo Selectoiun
  Ancillary order fixes, QLine API integrated & other enhancements
  Added user_info module IAP
  Medical File page updates
  Master merged
  Services Page Revamp
  loading view added
  graph shaded region added from horizontal spaces
  Refactoring
  Appointment Queue implemented, Blood Donation implementation contd.
  Integrated the API for Symptoms Checker
  Queueing system screen implementation contd.
  medical file changes
  Added symptoms selector
  ...

# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/my_appointments/my_appointments_repo.dart
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/home/landing_page.dart
3 months ago
..
api Incoming call updates 3 months ago
common_models units added to lab result and it graph and unwanted values removed from graph 5 months ago
exceptions Improved Error Handling 5 months ago
utils Health Calculators 3 months ago
api_consts.dart Merge branch 'master' into haroon_dev 3 months ago
app_assets.dart Merge branch 'master' into dev_aamir 3 months ago
app_export.dart family screen add fixes & remove & switch & widgets 5 months ago
app_state.dart cancel and listing request added 4 months ago
cache_consts.dart Incoming call updates 3 months ago
dependencies.dart Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 3 months ago
enums.dart Merge branch 'master' into dev_aamir 3 months ago
location_util.dart location dennied forever handled and error builder added to the image network 5 months ago
post_params_model.dart completed till otp receiving 6 months ago