Mohammad Aljammal
|
3fb522e15f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
lib/core/model/pharmacies/order_model.dart
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
lib/locator.dart
lib/main.dart
lib/pages/landing/landing_page_pharmcy.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/cart-order-preview.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/pages/pharmacies/wishlist.dart
lib/pages/pharmacy/order/Order.dart
lib/pages/pharmacy/order/OrderDetails.dart
lib/pages/pharmacy/order/ProductReview.dart
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
lib/pages/pharmacy/profile/profile.dart
lib/services/pharmacy_services/orderDetails_service.dart
lib/services/pharmacy_services/order_service.dart
lib/services/pharmacy_services/pharmacyAddress_service.dart
lib/services/pharmacy_services/wishList_service.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/borderedButton.dart
lib/widgets/others/app_scaffold_widget.dart
lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
Mohammad Aljammal
|
16d1f667d4
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
Mohammad Aljammal
|
a2e5b48915
|
fix merge issues
|
5 years ago |
mosazaid
|
0237d71931
|
make firebase-in app messaging commented to solve problem Duplicate class com.google.protobuf.WireFormat$Utf8Validation$3 found in modules jetified-protobuf-javalite-3.11.0.jar (com.google.protobuf:protobuf-javalite:3.11.0) and jetified-protobuf-lite-3.0.1.jar (com.google.protobuf:protobuf-lite:3.0.1)
|
5 years ago |
mosazaid
|
359eba2da0
|
make some updates in firebase version and update gradle, finish review order
|
5 years ago |
Zohaib Kambrani
|
1dc9400ffc
|
Geofencing work in progress on android
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
Zohaib Kambrani
|
8e554970f3
|
Wifi Connectivity and loading View
|
5 years ago |
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
5 years ago |
hussam al-habibeh
|
e74e168e88
|
Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
|
5 years ago |
hussam al-habibeh
|
f7cee8f484
|
pharmacy module app && category home page
|
5 years ago |
jammal
|
bd2254491c
|
done ER service
|
5 years ago |
Mohammad Aljammal
|
1ce55e687f
|
Ambulance Service second step
|
5 years ago |
Sultan Khan
|
5d112b5464
|
merge
|
5 years ago |
Sultan Khan
|
4c1a8dc38f
|
new changes
|
5 years ago |
Sultan Khan
|
f8d8e1c685
|
new pages added
|
5 years ago |
Mohammad Aljammal
|
3ed5c3878f
|
init project structure By Mohammad and Elham
|
5 years ago |