Commit Graph

899 Commits (a9bd9f1fdf771e0d57ea381f99f4e0b946916250)

Author SHA1 Message Date
haroon amjad a74a6d5bc8 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!499
3 years ago
devmirza121 6575456d3b Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
devmirza121 dc3d3bc772 Health Calculator 5.0 3 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Fatimah Alshammari c4e185ea60 fixed issues 3 years ago
haroon amjad 70304427f9 Doc specialty fix 3 years ago
devmirza121 590b795356 Health Calculator 4.0 marge 3 years ago
devmirza121 a131f24952 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
devmirza121 1d1708bdcc Health Calculator 4.0 3 years ago
haroon amjad 75989bdc01 Health Calculators translations 3 years ago
haroon amjad ea745f1b9f Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad efe8dea9a9 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!489
3 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 3 years ago
devmirza121 6225f2468d Health Calculator 3.0 3 years ago
devmirza121 d4eab13982 Health Calculator 2.0 3 years ago
devmirza121 e13d64dbf7 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
devmirza121 0b8600605b Health Calculator 1.0 3 years ago
Fatimah Alshammari ca11fe3134 fix issues 3 years ago
Fatimah Alshammari 239d2c1036 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 3 years ago
haroon amjad 894cc0e336 Updates & fixes 3 years ago
haroon amjad e1e31de818 Lakum fixes 3 years ago
haroon amjad 72784f68b9 Fixes & updates 3 years ago
haroon amjad be771917f0 pharmacy fixes 3 years ago
Fatimah Alshammari 28678633e7 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/lakum-main-page.dart
3 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 3 years ago
haroon amjad 585e26b091 Registration fix 3 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Mirza.Shafique fa986476ee feedback status bar 3 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 3 years ago
Mohammad Aljammal f9e33e7212 Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!467
3 years ago
Mohammad Aljammal 60d2496f0a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!472
3 years ago
Fatimah Alshammari 9cececf3f1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Fatimah Alshammari 044f74865e fixed issues 3 years ago
Elham Rababh d486b76116 fix merge issue 3 years ago
Elham Rababh c97c39ea11 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
 Conflicts:
	lib/config/config.dart
	lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
3 years ago
haroon amjad fa5fd8e323 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 0853ecdc27 Body added 3 years ago
haroon amjad 0c2e3f772b Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!468
3 years ago
Mirza.Shafique 69db41364f icon fixs 3 years ago
Fatimah Alshammari 42e74759e4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
3 years ago
Fatimah Alshammari e6378b7ada fix issues 3 years ago
Elham Rababh 616748dc6f fix proceed button 3 years ago
Zohaib Iqbal Kambrani 94a5cac27d Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  LiveCare Schedule fixes
  improvements.
  live care design 3.0
  dialog ui changes in wallet & improvements.
  LiveCare Schedule API fix
  live care design 2.0
  Health converters UI done
  Health Calculators APIs updated
  Translation updates
  SessionID update
  live care design 1.0
  Updates & fixes
  blood sugar dialog improvement.

# Conflicts: Rseloved
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Zohaib Iqbal Kambrani 9d71793e88 no message 3 years ago
Mirza.Shafique f56ae8ff5b Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
Mirza.Shafique 6af1747f12 live care design 3.0 3 years ago
Sikander Saleem 8c27773f7f Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 3 years ago
Mirza.Shafique a805273049 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago