Commit Graph

1937 Commits (853ca033d2fffad6dbea302b0abae2ee9adc10ea)

Author SHA1 Message Date
haroon amjad 853ca033d2 LiveCare Schedule API fix 4 years ago
Mirza.Shafique a805273049 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 4a8fc38626 live care design 2.0 4 years ago
haroon amjad 2a212149ed Health converters UI done 4 years ago
haroon amjad 73822300f9 Health Calculators APIs updated 4 years ago
haroon amjad 7123ed34ab Translation updates 4 years ago
haroon amjad fd07d543fa Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad cb69684bb8 SessionID update 4 years ago
Mirza.Shafique cacdd5907c Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique fd26a59b2d live care design 1.0 4 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad b08dfb117c Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 4c5b9b4244 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  Translation update
  Fixes & updates
  Blood donation fixes
  Pharmacy Payment method design fix, Blood Donation fix
  improvements
  blood donation dialog change & improvements.
  Pharmacy updates
  Pharmacy prescriptions page design
  LiveCare design fixes
4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 4 years ago
haroon amjad 5474ecf2cc Translation update 4 years ago
haroon amjad b53d912996 Fixes & updates 4 years ago
haroon amjad df7d8a8603 Blood donation fixes 4 years ago
haroon amjad 924f685342 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
Sikander Saleem ebb4c026c6 improvements 4 years ago
Sikander Saleem d8476df6dd Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
4 years ago
Sikander Saleem 4858f8883a blood donation dialog change & improvements. 4 years ago
haroon amjad 3dc82a0547 Pharmacy updates 4 years ago
haroon amjad eed4fd2509 Pharmacy prescriptions page design 4 years ago
haroon amjad 20076f2f2b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 2cff7c3246 LiveCare design fixes 4 years ago
Zohaib Iqbal Kambrani ebfa9cd630 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  Layout files
  pharmacy updates
  fixed issues
  Updates
  UI fixes
  Updates
  Smartwatch updates
  Smartwatch updates
  fixed issues
  fixed loader issue
4 years ago
Zohaib Iqbal Kambrani f3462dfc19 Applied cost from api at cart 4 years ago
haroon amjad 6f92a093ab Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad 9dbe922259 pharmacy updates 4 years ago
haroon amjad e58b925382 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/screens/cart-order-page.dart
4 years ago
Fatimah Alshammari a4f404386b fixed issues 4 years ago
haroon amjad 41822d2cf1 Merge branch 'development' into haroon-new-design 4 years ago
haroon amjad e913316c54 Updates 4 years ago
Zohaib Iqbal Kambrani 8b1ac05012 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
  app bar back icon issue
  improvements
  emergency nearest ui changes
  Zoom Avatar implementation
  no message
  Child Vaccine 3
  register
  register page
  Working on Health data
  Child Vaccine 2
  registration
  Ereferral fixed, HHC moved to new APIs, Notification new design implemented
  registration done
  Child Vaccine 1.0
  In App Review
  In App Review
  oder log merge fix
  design fixes 3
  Chart fix & In-App update implemented
  design fixes 1.1
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad 68829d0986 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Mirza.Shafique 0be197a782 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique e3bfe83ea2 app bar back icon issue 4 years ago
haroon amjad 940441106a UI fixes 4 years ago
haroon amjad be91844868 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 30c6f1dedb Updates 4 years ago
Sikander Saleem de43c6bfa4 improvements 4 years ago
Sikander Saleem 7641da8122 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/hospital_location.dart
4 years ago
Sikander Saleem 7c4edf971a emergency nearest ui changes 4 years ago
Mirza.Shafique fe1a287070 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 5514753288 Zoom Avatar implementation 4 years ago
haroon amjad 1fff2dad25 Smartwatch updates 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad d409875741 Smartwatch updates 4 years ago
haroon amjad b52c719351 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago