Fatimah Alshammari
|
0b21252ae7
|
fix category issue
|
5 years ago |
|
Fatimah Alshammari
|
b09b1e4732
|
six issues
|
5 years ago |
|
Fatimah Alshammari
|
a55ca33c1b
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
|
Fatimah Alshammari
|
bc9fc5a878
|
fix issue
|
5 years ago |
Elham Rababh
|
3e667d6b87
|
fix arabic language
|
5 years ago |
|
Elham Rababh
|
f623828d78
|
fix arabic language
|
5 years ago |
|
Fatimah Alshammari
|
d1e0b6ccd9
|
fix issue
|
5 years ago |
|
Fatimah Alshammari
|
044f74865e
|
fixed issues
|
5 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
|
5 years ago |
|
Fatimah Alshammari
|
e6378b7ada
|
fix issues
|
5 years ago |
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
5 years ago |
 Sikander Saleem
|
706832a1cb
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
5 years ago |
|
Elham Rababh
|
c7a0d39aab
|
first step of ProductDetailPage refactor
|
5 years ago |
|
haroon amjad
|
b51989e798
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/compare.dart
# lib/pages/pharmacies/my_reviews.dart
# lib/pages/pharmacies/wishlist.dart
|
5 years ago |
|
haroon amjad
|
7467da7409
|
Imports organized
|
5 years ago |
|
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
5 years ago |
hussam al-habibeh
|
1b76d9c192
|
pharmacy bugs fixed
|
5 years ago |
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
6 years ago |
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
6 years ago |
|
hussam al-habibeh
|
64cbae3602
|
Search
|
6 years ago |