Commit Graph

1793 Commits (bebcd8555751f1c2552aaeb5bcd3e71718a6e640)

Author SHA1 Message Date
haroon amjad bebcd85557 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 5943522163 UI 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 8d6278a59b Pharmacy fixes 3 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
3 years ago
haroon amjad 585e26b091 Registration fix 3 years ago
Mohammad Aljammal fd46259701 Merge branch 'bottom_nav_pharmacy' into 'development'
show bottom nav in pharmacy all pages

See merge request Cloud_Solution/diplomatic-quarter!479
3 years ago
hussam al-habibeh cb85085969 show bottom nav in pharmacy all pages 3 years ago
Mohammad Aljammal c0cf2f71a2 Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy

See merge request Cloud_Solution/diplomatic-quarter!478
3 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 3 years ago
haroon amjad f15090c634 Merge branch 'development_new_design_2.0' into 'sultan_new_design'
# Conflicts:
#   lib/pages/login/register.dart
3 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad e7f5fc8434 Blood donation fixes 3 years ago
Sultan Khan 64e62235c4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan a471824507 register issues 3 years ago
Mirza.Shafique fa986476ee feedback status bar 3 years ago
haroon amjad e82b8d4439 Lakum & other fixes 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
Mohammad Aljammal f424315a19 last commit 😄 3 years ago
Mohammad Aljammal d4283c0116 fix merge issue 3 years ago
Mohammad Aljammal 4cb63e353b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
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
haroon amjad 5692bc66a9 Removing anatomy pub from project 3 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 3 years ago
haroon amjad 668d725b25 Laser booking 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
mosazaid 4939fe63d1 pharmacy cart fixe counter 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 f547dc105c Merge branch 'development_new_design_2.0' into mirza_home_page 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
haroon amjad 62974b7b72 Updates & fixes 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
haroon amjad 57ea450662 LiveCare Schedule fixes 3 years ago
Sikander Saleem 455f65a5e5 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem d2223da3c2 improvements. 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