Mohammad Aljammal
|
b9022be8c1
|
Merge branch 'fix_design' into 'development'
Fix design
See merge request Cloud_Solution/diplomatic-quarter!246
|
5 years ago |
Sultan Khan
|
c65983bfdb
|
code merged
|
5 years ago |
Sultan Khan
|
86cf9300e1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter: (136 commits)
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
some design enhancments
fix design
fix android
fix merge issues
fix merge issues
commit
fix merge issues
change color
return privilege
return privilege
fix issues
...
|
5 years ago |
Zohaib Iqbal Kambrani
|
bbd953ae43
|
Order Delivery Driver tracking [inprogress]
|
5 years ago |
mosazaid
|
3a45239059
|
Merge branch 'development' into fix_design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
f5d478fd27
|
re-design child vaccine and fix some funcrionalities
|
5 years ago |
Mohammad Aljammal
|
4457b5f109
|
add translation to ER service
|
5 years ago |
Mohammad Aljammal
|
8d39e8b385
|
Merge branch 'fix_er' into 'development'
Fix ER service
See merge request Cloud_Solution/diplomatic-quarter!244
|
5 years ago |
Mohammad Aljammal
|
200334d8f8
|
Fix ER service
|
5 years ago |
Mohammad Aljammal
|
cf59057836
|
Merge branch 'fix_hhc_cmc' into 'development'
Fix hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!243
|
5 years ago |
Elham Rababah
|
4ecce79258
|
first step from fix CMC
|
5 years ago |
Elham Rababah
|
c9edb37a3c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
d7a046f9ca
|
fix issue on cmc
|
5 years ago |
Mohammad Aljammal
|
1cb5e250ed
|
Merge branch 'fix_design' into 'development'
Fix design
See merge request Cloud_Solution/diplomatic-quarter!241
|
5 years ago |
Mohammad Aljammal
|
80fdebc34d
|
Merge branch 'design_issues' into 'development'
return CMC HHC
See merge request Cloud_Solution/diplomatic-quarter!242
|
5 years ago |
Mohammad Aljammal
|
b63025a9b3
|
return CMC HHC
|
5 years ago |
mosazaid
|
ff85b2f1b2
|
Merge branch 'development' into fix_design
|
5 years ago |
mosazaid
|
5bcc67b77d
|
Nearest Er fix design
|
5 years ago |
Mohammad Aljammal
|
8f499578d5
|
Merge branch 'fix_design' into 'development'
Fix design
See merge request Cloud_Solution/diplomatic-quarter!240
|
5 years ago |
mosazaid
|
01bfe84644
|
solving NearestEr design problem
|
5 years ago |
mosazaid
|
e71a56ed51
|
Merge branch 'development' into fix_design
|
5 years ago |
mosazaid
|
d2e1a323ce
|
simple fix
|
5 years ago |
Zohaib Iqbal Kambrani
|
e2bce87e34
|
resolve merge conflicts.
|
5 years ago |
Mohammad Aljammal
|
013e3b0f1c
|
Merge branch 'design_issues' into 'development'
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!239
|
5 years ago |
Mohammad Aljammal
|
30ddea6419
|
hot fixing
|
5 years ago |
Zohaib Iqbal Kambrani
|
dc83b476d6
|
Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
5 years ago |
Mohammad Aljammal
|
ed729689a9
|
Merge branch 'design_issues' into 'development'
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
|
5 years ago |
Mohammad Aljammal
|
634c874eee
|
fix design issues
|
5 years ago |
Fatimah Alshammari
|
a1b2709ac8
|
fixed orders
|
5 years ago |
enadhilal
|
b8229fa8cd
|
Merge branch 'development' into enad_pharmacy2
|
5 years ago |
Fatimah Alshammari
|
ba4003cb56
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/locator.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/profile/profile.dart
|
5 years ago |
Fatimah Alshammari
|
52fa0f6f89
|
fixed orders
|
5 years ago |
Mohammad Aljammal
|
b01e718ae3
|
Merge branch 'fix_design' into 'development'
Fix design
See merge request Cloud_Solution/diplomatic-quarter!235
|
5 years ago |
mosazaid
|
2843b1393e
|
some design enhancments
|
5 years ago |
Mohammad Aljammal
|
72290f041f
|
fix design
|
5 years ago |
Mohammad Aljammal
|
975371a7fa
|
Merge branch 'development' into 'master'
Development
See merge request Cloud_Solution/diplomatic-quarter!234
|
5 years ago |
Mohammad Aljammal
|
5f788b556f
|
Merge branch 'fix_android' into 'development'
fix android
See merge request Cloud_Solution/diplomatic-quarter!233
|
5 years ago |
Mohammad Aljammal
|
1f03919094
|
fix android
|
5 years ago |
Mohammad Aljammal
|
05af339fed
|
Merge branch 'master' into 'development'
Master
See merge request Cloud_Solution/diplomatic-quarter!232
|
5 years ago |
Mohammad Aljammal
|
58c2401079
|
Merge branch 'pharmacy_merge' into 'master'
Pharmacy merge
See merge request Cloud_Solution/diplomatic-quarter!231
|
5 years ago |
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
5 years ago |
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
|
be1a2d4180
|
Merge branch 'master' into 'development'
Master
See merge request Cloud_Solution/diplomatic-quarter!230
|
5 years ago |
Mohammad Aljammal
|
fa38d55c05
|
Merge branch 'change_color' into 'master'
change color
See merge request Cloud_Solution/diplomatic-quarter!229
|
5 years ago |
Mohammad Aljammal
|
e61e02742c
|
Merge branch 'fatima_merge' into 'pharmacy'
Fatima merge
See merge request Cloud_Solution/diplomatic-quarter!228
|
5 years ago |
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 |