haroon amjad
|
829fcd1461
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
|
4 years ago |
haroon amjad
|
2c4ff16f0c
|
updates & fixes
|
4 years ago |
Sultan khan
|
0db34ed226
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!426
|
4 years ago |
Sultan Khan
|
821a9b5ade
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
2c1d7c511e
|
family file changes
|
4 years ago |
haroon amjad
|
230d87c473
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
cb230db0c5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
a9773e81e7
|
Bug Fixes prescription
|
4 years ago |
Sikander Saleem
|
8b49eed6ae
|
hospital text replaced with branch
|
4 years ago |
Fatimah Alshammari
|
ac63f09633
|
edit arabic version
|
4 years ago |
Fatimah Alshammari
|
8baad999c5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/config/config.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/wishlist.dart
|
4 years ago |
Elham Rababh
|
8fac62bcb1
|
fix bottom sheet functions
|
4 years ago |
Fatimah Alshammari
|
74929f76e5
|
edit home page
|
4 years ago |
Mohammad Aljammal
|
bcd99555e3
|
Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!423
|
4 years ago |
mosazaid
|
988625e4f1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
|
4 years ago |
mosazaid
|
c1f3d3cc1c
|
fixes
|
4 years ago |
Mohammad Aljammal
|
ad8fd65f75
|
Merge branch 'product_detail_page' into 'development'
add count to cart
See merge request Cloud_Solution/diplomatic-quarter!422
|
4 years ago |
Elham Rababh
|
944bbce1bf
|
add count to cart
|
4 years ago |
Elham Rababh
|
bfbd04e35d
|
add count to cart
|
4 years ago |
mosazaid
|
acdd19eeed
|
calling cart from pharmacy home and add provider to it
|
4 years ago |
Mohammad Aljammal
|
f736ab5365
|
Merge branch 'fix_product_tile' into 'development'
Fix product tile
See merge request Cloud_Solution/diplomatic-quarter!421
|
4 years ago |
Mohammad Aljammal
|
0150bc4684
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacies/ProductCheckTypeWidget.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
Mohammad Aljammal
|
d2be206d6c
|
Merge branch 'product_detail_page' into 'development'
Product detail page
See merge request Cloud_Solution/diplomatic-quarter!420
|
4 years ago |
Mohammad Aljammal
|
eb19daa98f
|
fix car count
|
4 years ago |
Elham Rababh
|
3dc28d318a
|
fix bugs on wish list
|
4 years ago |
Fatimah Alshammari
|
4309952b17
|
fixed subCategories
|
4 years ago |
Sikander Saleem
|
b4031e973e
|
chevron icon to arrow forward
|
4 years ago |
Elham Rababh
|
b0b278a7e3
|
fix bugs
|
4 years ago |
haroon amjad
|
503ab739ca
|
prescription availability design revamped
|
4 years ago |
Elham Rababh
|
145117aa63
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
|
4 years ago |
Elham Rababh
|
9254004125
|
fix coloring issue
|
4 years ago |
Mohammad Aljammal
|
0e373059a0
|
Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!419
|
4 years ago |
mosazaid
|
8b5e1e57c7
|
fix bugs pharmacy wishlist
|
4 years ago |
mosazaid
|
4d37bc2958
|
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
lib/pages/pharmacies/screens/product-details/recommended_products.dart
lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
lib/widgets/others/app_scafold_detail_page.dart
|
4 years ago |
mosazaid
|
a41980b252
|
fix bugs pharmacy wishlist
|
4 years ago |
Elham Rababh
|
7de8c2588f
|
fix coloring issue
|
4 years ago |
haroon amjad
|
46a572674f
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
69af6799c4
|
updates
|
4 years ago |
Mirza.Shafique
|
3a40eb92be
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Sultan khan
|
51cab0928a
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!418
|
4 years ago |
Mirza.Shafique
|
06c5ee269b
|
Bug Fixes
|
4 years ago |
Sultan Khan
|
f53f2f7cab
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
1b387c2dbf
|
changes pushed
|
4 years ago |
Mohammad Aljammal
|
00a0e34347
|
Merge branch 'product_detail_page' into 'development'
add loader and cache on images
See merge request Cloud_Solution/diplomatic-quarter!415
|
4 years ago |
Elham Rababh
|
58d43f7e46
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Mohammad Aljammal
|
e578b1e759
|
Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home and increase performance
See merge request Cloud_Solution/diplomatic-quarter!416
|
4 years ago |
Elham Rababh
|
2981eb3236
|
fix public card issues
|
4 years ago |
haroon amjad
|
2690bddcac
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
4 years ago |