Commit Graph

800 Commits (853ca033d2fffad6dbea302b0abae2ee9adc10ea)

Author SHA1 Message Date
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
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 b53d912996 Fixes & updates 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
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 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 be91844868 Merge branch 'development_new_design_2.0' into haroon-new-design 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
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad d409875741 Smartwatch updates 4 years ago
haroon amjad 1f077f71f8 no message 4 years ago
Fatimah Alshammari e494c9304d fixed issues 4 years ago
haroon amjad 3db4094585 Ereferral fixed, HHC moved to new APIs, Notification new design implemented 4 years ago
haroon amjad 3d22cdb17c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 680dcfc255 In App Review 4 years ago
Mirza.Shafique d3698a0e74 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
4 years ago
Mirza.Shafique 3d480bac5c design fixes 3 4 years ago
haroon amjad 4b0382d7c4 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 12a58856e5 Chart fix & In-App update implemented 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
haroon amjad a710406317 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
4 years ago
haroon amjad 494b1f221d Updates & fixes 4 years ago
Mirza.Shafique 792bb4df0b Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 8001c0140c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
4 years ago
Sikander Saleem 554b9558b1 add reminder & send mail button color change. 4 years ago
Haroon Amjad 59dac89118 updates 4 years ago
haroon amjad 832d48971f updates 4 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
haroon amjad 43a672cc68 Updates & fixes 4 years ago
haroon amjad 5d44fff28d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
Sikander Saleem ecb6315f9c blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago