Commit Graph

2216 Commits (a1b4e1c8a3e1ca42d94fea89bacbae40e4039458)

Author SHA1 Message Date
Fatimah Alshammari 998c1af0f7 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari ae3bb1bb2d fix issues 4 years ago
haroon amjad ab7162f164 Base app client updates 4 years ago
haroon amjad 68294690a1 prescription reminders added 4 years ago
haroon amjad ff0e878bf2 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
devmirza121 7f8a0320a7 Medical Reminder 1.0 4 years ago
haroon amjad 61a406085b lakum fixes 4 years ago
devmirza121 f3b7a5c318 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 69b1dd6533 Medical Reminder 4 years ago
haroon amjad 47b7b0db58 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
Sikander Saleem 044c442ce0 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/parent_categorise_page.dart
4 years ago
Sikander Saleem 5a8c887117 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Fatimah Alshammari bdf3429502 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
haroon amjad 8c9ff27515 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 777d88be30 updates 4 years ago
haroon amjad 87a997d156 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!521
4 years ago
Fatimah Alshammari 54ff9931cb fixed arrow issue order page 4 years ago
Sikander Saleem 084c82d7a8 improvements 4 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
4 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
4 years ago
hussam al-habibeh 7607631052 sub categories pagnation 4 years ago
hussam al-habibeh c0e86721f6 Merge branch 'nov_fixes' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
hussam al-habibeh db1820fda4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 4 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 4 years ago
Fatimah Alshammari 3bfca80ab9 fixed issue 4 years ago
Elham Rababh 258e107e1b fix cart order page 4 years ago
hussam al-habibeh ff86dcbdc0 sub categories pagnation 4 years ago
Elham Rababh 7b6622ee4c fix cart order page 4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 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
4 years ago
Fatimah Alshammari adfa707eda fix issue 4 years ago
haroon amjad f533dd5356 Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart order page

See merge request Cloud_Solution/diplomatic-quarter!515
4 years ago
Elham Rababh 6ff829ab91 fix cart order page 4 years ago
haroon amjad d78d1f1068 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
sub categorise fix

See merge request Cloud_Solution/diplomatic-quarter!511
4 years ago
haroon amjad 6db5577a12 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fixed issues

See merge request Cloud_Solution/diplomatic-quarter!513
4 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
4 years ago
Elham Rababh 275871bc39 fix addcustomeraddress 4 years ago
hussam al-habibeh e917da9183 sub Categorise fixed 4 years ago
hussam al-habibeh 80c6be239e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh 300668cc81 sub Categorise fixed 4 years ago
Fatimah Alshammari 333247faa2 fixed issues 4 years ago
Elham Rababh fb1d07fcba fix cart back button 4 years ago
haroon amjad d630c6c45f Pharmacy fixes 4 years ago
hussam al-habibeh d7b32df024 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh 9ccb155761 sub categorise fix 4 years ago
Haroon Amjad 464ad9a3cb Shopping cart fix 4 years ago
haroon amjad 67b6fd4ab6 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Elham Ali f0bb496df5 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!506
4 years ago
haroon amjad 7a8ed5b014 Total amount calculation fixes 4 years ago
hussam al-habibeh b09bc3bef9 merge dev to hussam pharmacy fix 4 years ago
haroon amjad c29aee46dd Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
4 years ago
haroon amjad a3fdb35c30 fixes 4 years ago
Elham Rababh f88864efd4 fix calling missing APi 4 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
4 years ago
hussam al-habibeh 307e488a0e pharmacy product pagination 4 years ago
hussam al-habibeh a35e149088 product pagination 4 years ago
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 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
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 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 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
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
hussam al-habibeh b2b786d157 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
haroon amjad 6ffa07392c Product detail page updates 4 years ago
Elham Rababh f8883f5439 first step from fixing check out process 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
haroon amjad 75989bdc01 Health Calculators translations 4 years ago
haroon amjad 90b821a37d Offers & packages UI completed 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
devmirza121 566de7936a Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 6225f2468d Health Calculator 3.0 4 years ago
Fatimah Alshammari ce0dff11b2 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari eb4801c7ee fixed rating issues 4 years ago
Haroon Amjad d5c68c5032 Packages & offers design 4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
devmirza121 d4eab13982 Health Calculator 2.0 4 years ago
devmirza121 e13d64dbf7 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 0b8600605b Health Calculator 1.0 4 years ago
Fatimah Alshammari 77c8c85e88 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
haroon amjad 9ce77b56b9 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Fatimah Alshammari ca11fe3134 fix issues 4 years ago
haroon amjad 30e67bbe3e updates 4 years ago
haroon amjad c253ec3110 LiveCare UI revamped 4 years ago
haroon amjad f995a9fa8e Ambulance request UI revamped 4 years ago
Fatimah Alshammari 239d2c1036 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
Fatimah Alshammari 6f63250252 fix issues 4 years ago
haroon amjad e1e31de818 Lakum fixes 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
haroon amjad bebcd85557 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5943522163 UI fixes 4 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
4 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 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
4 years ago
haroon amjad 585e26b091 Registration fix 4 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
4 years ago
hussam al-habibeh cb85085969 show bottom nav in pharmacy all pages 4 years ago
Sikander Saleem d6a5f68312 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Mohammad Aljammal c0cf2f71a2 Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy

See merge request Cloud_Solution/diplomatic-quarter!478
4 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
Sikander Saleem cd81f05a8d laser clinic design (cont.) 4 years ago
haroon amjad f15090c634 Merge branch 'development_new_design_2.0' into 'sultan_new_design'
# Conflicts:
#   lib/pages/login/register.dart
4 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad e7f5fc8434 Blood donation fixes 4 years ago
Sultan Khan 64e62235c4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan a471824507 register issues 4 years ago
Mirza.Shafique fa986476ee feedback status bar 4 years ago
haroon amjad e82b8d4439 Lakum & other fixes 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 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
4 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
4 years ago
Mohammad Aljammal f424315a19 last commit 😄 4 years ago
Mohammad Aljammal d4283c0116 fix merge issue 4 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
4 years ago
Fatimah Alshammari 9cececf3f1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 044f74865e fixed issues 4 years ago
haroon amjad 5692bc66a9 Removing anatomy pub from project 4 years ago