Commit Graph

11 Commits (bb4719bd8747b27cd6f663b6ed842e41ef8bceda)

Author SHA1 Message Date
aamir-csol 8b701255ed logout & family file fix 1 week ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
2 weeks ago
haroon amjad 3ff9628cd3 Translation updates 2 weeks ago
aamir-csol 0017c0601b blood donation changes 2 weeks ago
aamir-csol d76ff5828f fixes 2 weeks ago
aamir-csol b815affe5c blood group 3 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
1 month ago
Sultan khan 873b2a1591 sorting done, covid inprogress 1 month ago
haroon amjad 3cc2610d30 updates 1 month ago
haroon amjad a83a35a284 Services Page Revamp 2 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 2 months ago