Commit Graph

763 Commits (c82f01cd1ab4d80ad16cb4a2f5d3630c19dfed9a)
 

Author SHA1 Message Date
Mohammad Aljammal c82f01cd1a fix merge issues 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 7dd72d1324 Merge branch 'pharmacy_mosa_branch' into 'pharmacy'
Pharmacy mosa branch

See merge request Cloud_Solution/diplomatic-quarter!176
5 years ago
mosazaid d77a607b78 commit 5 years ago
mosazaid 38d58ebaaf Merge branch 'pharmacy' into pharmacy_mosa_branch
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
#	lib/services/pharmacy_services/pharmacyAddress_service.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal b03b73ec26 Merge branch 'enad_pharmacy_merge' into 'pharmacy'
Enad pharmacy merge

See merge request Cloud_Solution/diplomatic-quarter!227
5 years ago
Mohammad Aljammal a2e5b48915 fix merge issues 5 years ago
Mohammad Aljammal 6827efc1b6 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge 5 years ago
Mohammad Aljammal d7fe93b3f3 Merge branch 'pharmacy-hussam' into 'pharmacy'
parent_categorise_page update

See merge request Cloud_Solution/diplomatic-quarter!226
5 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari 5fa5e9b7c8 fixed orders and profile 5 years ago
Fatimah Alshammari e5bf7acc52 Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
#	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari fda101840a fixed order isuues 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
Fatimah Alshammari 4a84483698 fixed order details 5 years ago
mosazaid c058cf0e93 finish address add/edit/delete/select 5 years ago
mosazaid 6ac8d67b83 finish address add/edit/delete/select 5 years ago
hussam al-habibeh e85b21c08f parent_categorise_page update 5 years ago
enadhilal 727940c5c6 fixed merging issues 5 years ago
mosazaid 378562b781 adding some changes in order pages like translate texts 5 years ago
enadhilal 9c55571072 Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
enadhilal c22ca4e29e Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
haroon amjad 849723ffd3 Merge branch 'pharmacy-Fatima' into 'pharmacy'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!162
5 years ago
enadhilal 888a74fb9b add these pages
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
5 years ago
Fatimah Alshammari ed68eed9df added links for profile 5 years ago
Fatimah Alshammari 706980248a Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/home_page.dart
5 years ago
Fatimah Alshammari 9b8103bfd6 fixe order and order details 5 years ago
haroon amjad 9575a236d4 Merge branch 'pharmacy-hussam' into 'pharmacy'
Pharmacy hussam

See merge request Cloud_Solution/diplomatic-quarter!155
5 years ago
hussam al-habibeh 5dc3c53550 mousa and hussam branch 5 years ago
hussam al-habibeh a1906a4072 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
hussam al-habibeh 800565407d 12/6 5 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 5 years ago
haroon amjad 257dc3d76d Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
create terms-condition in pharmacy order page

See merge request Cloud_Solution/diplomatic-quarter!154
5 years ago
mosazaid 7ee7ef58c4 working on dynamic title on pharmacy 5 years ago
umasoodch 1f9d592268 removed access key code in pubspec 5 years ago
umasoodch b5413d1749 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
umasoodch 9f0fd8f144 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy 5 years ago
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 5 years ago
haroon amjad a85ef855f5 Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
commit

See merge request Cloud_Solution/diplomatic-quarter!153
5 years ago
mosazaid 2a91ae787f commit 5 years ago
hussam al-habibeh 8b8207cb0d search 5 years ago
hussam al-habibeh 64cbae3602 Search 5 years ago
Mohammad Aljammal 1394ceed3c Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
Pharmacy module feature home page

See merge request Cloud_Solution/diplomatic-quarter!147
5 years ago
mosazaid 35d0d3e441 finsi lakum points task 5 years ago
Mohammad Aljammal dbca686adf Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!142
5 years ago
Elham Rababah d9ffc5d3da remove duplicated package 5 years ago
Elham Rababah 713e44cf8b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah ea195ea9bf Finish translate CMC HHC 5 years ago