Commit Graph

12 Commits (f19d06512aae7a8d8ddc2290b8a79f6dfdbeb413)

Author SHA1 Message Date
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
3 weeks 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
4 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
4 weeks ago
Sultan khan 873b2a1591 sorting done, covid inprogress 4 weeks ago
aamir-csol 135b05e561 Health calculators & converters 4 weeks ago
faizatflutter fd2abbbc7b Water Intake Design completed 1 month ago
Sultan khan ddac155a6a silent login case handled. 2 months ago
Sultan khan 2532b494f7 e-referral done. 2 months ago
Sultan khan fb69723a65 e-referral done. 2 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 2 months ago
Sultan khan c43f96c619 e-referral work in progress 2 months ago
Sultan khan 171bd644d1 e-referral work in progress. 2 months ago