f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
4 years ago
0b1014a91c
fix blood sugar service on my tracker
4 years ago
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
4 years ago
535f8876f6
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
HMGInternet & Geofence Merge into Development branch
See merge request Cloud_Solution/diplomatic-quarter!238
4 years ago
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
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
# Conflicts:
# lib/config/localized_values.dart
4 years ago
b9022be8c1
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!246
4 years ago
bbd953ae43
Order Delivery Driver tracking [inprogress]
4 years ago
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
f5d478fd27
re-design child vaccine and fix some funcrionalities
4 years ago
4457b5f109
add translation to ER service
4 years ago
8d39e8b385
Merge branch 'fix_er' into 'development'
...
Fix ER service
See merge request Cloud_Solution/diplomatic-quarter!244
4 years ago
200334d8f8
Fix ER service
4 years ago
cf59057836
Merge branch 'fix_hhc_cmc' into 'development'
...
Fix hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!243
4 years ago
4ecce79258
first step from fix CMC
4 years ago
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
4 years ago
d7a046f9ca
fix issue on cmc
4 years ago
1cb5e250ed
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!241
4 years ago
80fdebc34d
Merge branch 'design_issues' into 'development'
...
return CMC HHC
See merge request Cloud_Solution/diplomatic-quarter!242
4 years ago
b63025a9b3
return CMC HHC
4 years ago
ff85b2f1b2
Merge branch 'development' into fix_design
4 years ago
5bcc67b77d
Nearest Er fix design
4 years ago
8f499578d5
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!240
4 years ago
01bfe84644
solving NearestEr design problem
4 years ago
e71a56ed51
Merge branch 'development' into fix_design
4 years ago
d2e1a323ce
simple fix
4 years ago
e2bce87e34
resolve merge conflicts.
4 years ago
013e3b0f1c
Merge branch 'design_issues' into 'development'
...
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!239
4 years ago
30ddea6419
hot fixing
4 years ago
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
4 years ago
ed729689a9
Merge branch 'design_issues' into 'development'
...
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
4 years ago
634c874eee
fix design issues
4 years ago
a1b2709ac8
fixed orders
4 years ago
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
4 years ago
52fa0f6f89
fixed orders
4 years ago
b01e718ae3
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!235
4 years ago
2843b1393e
some design enhancments
4 years ago
72290f041f
fix design
4 years ago
975371a7fa
Merge branch 'development' into 'master'
...
Development
See merge request Cloud_Solution/diplomatic-quarter!234
4 years ago
5f788b556f
Merge branch 'fix_android' into 'development'
...
fix android
See merge request Cloud_Solution/diplomatic-quarter!233
4 years ago
1f03919094
fix android
4 years ago
05af339fed
Merge branch 'master' into 'development'
...
Master
See merge request Cloud_Solution/diplomatic-quarter!232
4 years ago
58c2401079
Merge branch 'pharmacy_merge' into 'master'
...
Pharmacy merge
See merge request Cloud_Solution/diplomatic-quarter!231
4 years ago
de1b7cc1d0
fix merge issues
4 years ago
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
4 years ago
be1a2d4180
Merge branch 'master' into 'development'
...
Master
See merge request Cloud_Solution/diplomatic-quarter!230
4 years ago
fa38d55c05
Merge branch 'change_color' into 'master'
...
change color
See merge request Cloud_Solution/diplomatic-quarter!229
4 years ago
e61e02742c
Merge branch 'fatima_merge' into 'pharmacy'
...
Fatima merge
See merge request Cloud_Solution/diplomatic-quarter!228
4 years ago
c82f01cd1a
fix merge issues
4 years ago
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
4 years ago
7dd72d1324
Merge branch 'pharmacy_mosa_branch' into 'pharmacy'
...
Pharmacy mosa branch
See merge request Cloud_Solution/diplomatic-quarter!176
4 years ago
Mohammad Aljammal
Fatimah Alshammari
Mohammad Aljammal
Zohaib Iqbal Kambrani
mosazaid
Elham Rababah