Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
be1a2d4180
|
Merge branch 'master' into 'development'
Master
See merge request Cloud_Solution/diplomatic-quarter!230
|
4 years ago |
|
Mohammad Aljammal
|
fa38d55c05
|
Merge branch 'change_color' into 'master'
change color
See merge request Cloud_Solution/diplomatic-quarter!229
|
4 years ago |
|
Mohammad Aljammal
|
e61e02742c
|
Merge branch 'fatima_merge' into 'pharmacy'
Fatima merge
See merge request Cloud_Solution/diplomatic-quarter!228
|
4 years ago |
|
Mohammad Aljammal
|
c82f01cd1a
|
fix merge issues
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
7dd72d1324
|
Merge branch 'pharmacy_mosa_branch' into 'pharmacy'
Pharmacy mosa branch
See merge request Cloud_Solution/diplomatic-quarter!176
|
4 years ago |
mosazaid
|
d77a607b78
|
commit
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
b03b73ec26
|
Merge branch 'enad_pharmacy_merge' into 'pharmacy'
Enad pharmacy merge
See merge request Cloud_Solution/diplomatic-quarter!227
|
4 years ago |
|
Mohammad Aljammal
|
a2e5b48915
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
6827efc1b6
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge
|
4 years ago |
|
Mohammad Aljammal
|
d7fe93b3f3
|
Merge branch 'pharmacy-hussam' into 'pharmacy'
parent_categorise_page update
See merge request Cloud_Solution/diplomatic-quarter!226
|
4 years ago |
|
Mohammad Aljammal
|
298b4d6525
|
change color
|
4 years ago |
|
Mohammad Aljammal
|
71417da030
|
Merge branch 'merge_dq_master' into 'master'
Merge dq master
See merge request Cloud_Solution/diplomatic-quarter!224
|
4 years ago |
|
Mohammad Aljammal
|
1968eb4682
|
return privilege
|
4 years ago |
|
Mohammad Aljammal
|
952e106531
|
return privilege
|
4 years ago |
|
Mohammad Aljammal
|
f77d2b497e
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
18dad434a0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/service/weather_service.dart
lib/core/viewModels/dashboard_view_model.dart
lib/main.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
lib/pages/BookAppointment/Search.dart
lib/pages/ErService/AmbulanceReq.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/pages/login/register.dart
lib/pages/medical/allergies_page.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/doctor/doctor_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
lib/uitl/location_util.dart
lib/widgets/drawer/app_drawer_widget.dart
pubspec.yaml
|
4 years ago |
enadhilal
|
10734d5994
|
connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
|
4 years ago |
|
Mohammad Aljammal
|
4f59bd38df
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!223
|
4 years ago |
|
Mohammad Aljammal
|
6bda03e935
|
hot fixing
|
4 years ago |
|
Mohammad Aljammal
|
0f3de39aba
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
dashboard issue fixed
See merge request Cloud_Solution/diplomatic-quarter!222
|
4 years ago |
Sultan Khan
|
e6a94f8014
|
login design
|
4 years ago |
|
Sultan Khan
|
b992978af4
|
login
|
4 years ago |
|
Sultan Khan
|
764e706000
|
dashboard issue fixed
|
4 years ago |
|
Mohammad Aljammal
|
8ac3bc71dc
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!221
|
4 years ago |
|
Sultan Khan
|
c01246acf0
|
hot fix
|
4 years ago |
|
Sultan Khan
|
2b48578e07
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
016dffcb87
|
change
|
4 years ago |
|
Mohammad Aljammal
|
6ffaa85864
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
fix last vital sign data
See merge request Cloud_Solution/diplomatic-quarter!220
|
4 years ago |
|
Mohammad Aljammal
|
4263672f00
|
fim last vital sign data
|
4 years ago |
|
Mohammad Aljammal
|
80da19555c
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!218
|
4 years ago |
|
Mohammad Aljammal
|
519a474d41
|
fix live care label and vital sign data
|
4 years ago |
Fatimah Alshammari
|
c0920e7099
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Fatimah Alshammari
|
5fa5e9b7c8
|
fixed orders and profile
|
4 years ago |
|
Mohammad Aljammal
|
5e3f6363cf
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
85a8bdf55b
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!217
|
4 years ago |
|
Mohammad Aljammal
|
754e60eb72
|
fix send email lab result
|
4 years ago |
|
Sultan Khan
|
6b4bae7370
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
827768e96d
|
language change
|
4 years ago |
|
Mohammad Aljammal
|
eb459010a9
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
change the info images
See merge request Cloud_Solution/diplomatic-quarter!216
|
4 years ago |
|
Mohammad Aljammal
|
591d56e624
|
change the info images and change the out patient color
|
4 years ago |
Zohaib Kambrani
|
f03adb37ce
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
5c8e43c163
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
4 years ago |
|
Mohammad Aljammal
|
2553b032dd
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!215
|
4 years ago |
|
Sultan Khan
|
8becd4f920
|
login issue fixed
|
4 years ago |
|
Sultan Khan
|
3edae19ad6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
c9538c6a84
|
family files
|
4 years ago |