Commit Graph

2498 Commits (a9bd9f1fdf771e0d57ea381f99f4e0b946916250)
 

Author SHA1 Message Date
Elham Ali a9bd9f1fdf Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix bottom bar  in cart page

See merge request Cloud_Solution/diplomatic-quarter!504
4 years ago
haroon amjad 1686c10851 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
fixes

See merge request Cloud_Solution/diplomatic-quarter!505
4 years ago
haroon amjad 289e74fd0a fixes 4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
haroon amjad 08f0f7b660 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue

See merge request Cloud_Solution/diplomatic-quarter!501
4 years ago
Elham Ali 47c2c80b36 Merge branch 'nov_fixes' into 'development_new_design_2.0'
Nov fixes

See merge request Cloud_Solution/diplomatic-quarter!502
4 years ago
Elham Rababh 65aac99806 fix Availabilty part 4 years ago
Fatimah Alshammari d1e0b6ccd9 fix issue 4 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
4 years ago
haroon amjad f1b44e9f0b Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!500
4 years ago
devmirza121 6575456d3b Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
devmirza121 dc3d3bc772 Health Calculator 5.0 4 years ago
Elham Rababh 8a168386da fix black screen which is appear in cart page 4 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 96ec3f2926 fix issues 4 years ago
Elham Rababh dc7a5d3dca Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad 62c0333dbd Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!498
4 years ago
haroon amjad 3ec2f990b1 product detail page updates 4 years ago
Fatimah Alshammari c4e185ea60 fixed issues 4 years ago
Elham Rababh 2c3c270c43 finish steps inside payment 4 years ago
Elham Rababh b7dc6ee4b1 change model 4 years ago
Fatimah Alshammari 444bc7383d Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 62d904aa68 fixed issues 4 years ago
Elham Rababh 41097f119c Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad 70304427f9 Doc specialty fix 4 years ago
haroon amjad 11d37d26e5 Product Detail page fix 4 years ago
Elham Rababh 45d167fc5e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad fd3d2b588b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!497
4 years ago
haroon amjad 338c646a43 updates 4 years ago
haroon amjad 534b82461a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 14b85cc407 Family files API changes 4 years ago
haroon amjad 740cb79df0 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!496
4 years ago
devmirza121 590b795356 Health Calculator 4.0 marge 4 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
4 years ago
devmirza121 1d1708bdcc Health Calculator 4.0 4 years ago
Elham Rababh 4e54349e3b Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Elham Rababh df9e58402d first step from update design 4 years ago
haroon amjad 6ffa07392c Product detail page updates 4 years ago
haroon amjad 9563998fc3 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Product detail page updates

See merge request Cloud_Solution/diplomatic-quarter!495
4 years ago
Elham Rababh f8883f5439 first step from fixing check out process 4 years ago
haroon amjad 75989bdc01 Health Calculators translations 4 years ago
haroon amjad 0c870385ee Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!494
4 years ago
haroon amjad db7bc11893 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 90b821a37d Offers & packages UI completed 4 years ago
haroon amjad f7aafcda1a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!493
4 years ago
haroon amjad d2834bb3dd Health calculator fixes 4 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
4 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
4 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 4 years ago
haroon amjad e7ec613cd4 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!492
4 years ago