Commit Graph

937 Commits (14b0c4c1255ab838600edcd3bc27f314a73c783b)

Author SHA1 Message Date
haroon amjad 14b0c4c125 Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design

See merge request Cloud_Solution/diplomatic-quarter!550
3 years ago
Elham Rababh d6eeb02c91 fix on design 3 years ago
haroon amjad d1fcdcc898 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 3 years ago
Elham Rababh c6be53d800 first step from product details 3 years ago
Elham Rababh a71e7e4075 first step from product details 3 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
Elham Rababh 12e47aba82 fix as first step 3 years ago
haroon amjad 17d569216d Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!539
3 years ago
Fatimah Alshammari d25f888c3e Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/lakum-main-page.dart
3 years ago
Fatimah Alshammari a858d8764a fixed issues 3 years ago
devmirza121 f9e98c5fa4 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 3 years ago
haroon amjad 4b446bb6d0 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sikander Saleem 407fb81038 Merge branch 'development_new_design_2.0' into new_design_sikander 3 years ago
Sikander Saleem 7df0fc59df laser images change & offer and packages 3 years ago
haroon amjad 5f0985adaa Updates 3 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 3 years ago
haroon amjad 68294690a1 prescription reminders added 3 years ago
devmirza121 f3b7a5c318 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
devmirza121 69b1dd6533 Medical Reminder 3 years ago
Sikander Saleem 044c442ce0 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/parent_categorise_page.dart
3 years ago
Sikander Saleem 5a8c887117 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Sikander Saleem 00f63cd288 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 014074c414 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
3 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 3 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 3 years ago
haroon amjad f4ccecc1af Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue

See merge request Cloud_Solution/diplomatic-quarter!516
3 years ago
Fatimah Alshammari adfa707eda fix issue 3 years ago
haroon amjad d4e71fd8ec Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart back button

See merge request Cloud_Solution/diplomatic-quarter!514
3 years ago
Elham Rababh 275871bc39 fix addcustomeraddress 3 years ago
haroon amjad d630c6c45f Pharmacy fixes 3 years ago
hussam al-habibeh b09bc3bef9 merge dev to hussam pharmacy fix 3 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
3 years ago
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
hussam al-habibeh b2b786d157 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 3 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 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