Sultan Khan
|
68f7a9ff9c
|
login chnages
|
4 years ago |
|
Sultan Khan
|
c65983bfdb
|
code merged
|
4 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
...
|
4 years ago |
Mohammad Aljammal
|
8d39e8b385
|
Merge branch 'fix_er' into 'development'
Fix ER service
See merge request Cloud_Solution/diplomatic-quarter!244
|
4 years ago |
Mohammad Aljammal
|
200334d8f8
|
Fix ER service
|
4 years ago |
|
Mohammad Aljammal
|
cf59057836
|
Merge branch 'fix_hhc_cmc' into 'development'
Fix hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!243
|
4 years ago |
Elham Rababah
|
4ecce79258
|
first step from fix CMC
|
4 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
|
4 years ago |
|
Elham Rababah
|
d7a046f9ca
|
fix issue on cmc
|
4 years ago |
|
Mohammad Aljammal
|
1cb5e250ed
|
Merge branch 'fix_design' into 'development'
Fix design
See merge request Cloud_Solution/diplomatic-quarter!241
|
4 years ago |
|
Mohammad Aljammal
|
80fdebc34d
|
Merge branch 'design_issues' into 'development'
return CMC HHC
See merge request Cloud_Solution/diplomatic-quarter!242
|
4 years ago |
|
Mohammad Aljammal
|
b63025a9b3
|
return CMC HHC
|
4 years ago |
mosazaid
|
ff85b2f1b2
|
Merge branch 'development' into fix_design
|
4 years ago |
|
mosazaid
|
5bcc67b77d
|
Nearest Er fix design
|
4 years ago |
|
Mohammad Aljammal
|
8f499578d5
|
Merge branch 'fix_design' into 'development'
Fix design
See merge request Cloud_Solution/diplomatic-quarter!240
|
4 years ago |
|
mosazaid
|
01bfe84644
|
solving NearestEr design problem
|
4 years ago |
|
mosazaid
|
e71a56ed51
|
Merge branch 'development' into fix_design
|
4 years ago |
|
mosazaid
|
d2e1a323ce
|
simple fix
|
4 years ago |
|
Mohammad Aljammal
|
013e3b0f1c
|
Merge branch 'design_issues' into 'development'
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!239
|
4 years ago |
|
Mohammad Aljammal
|
30ddea6419
|
hot fixing
|
4 years ago |
|
Mohammad Aljammal
|
ed729689a9
|
Merge branch 'design_issues' into 'development'
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
|
4 years ago |
|
Mohammad Aljammal
|
634c874eee
|
fix design issues
|
4 years ago |
|
Mohammad Aljammal
|
b01e718ae3
|
Merge branch 'fix_design' into 'development'
Fix design
See merge request Cloud_Solution/diplomatic-quarter!235
|
4 years ago |
|
mosazaid
|
2843b1393e
|
some design enhancments
|
4 years ago |
|
Mohammad Aljammal
|
72290f041f
|
fix design
|
4 years ago |
|
Mohammad Aljammal
|
5f788b556f
|
Merge branch 'fix_android' into 'development'
fix android
See merge request Cloud_Solution/diplomatic-quarter!233
|
4 years ago |
|
Mohammad Aljammal
|
1f03919094
|
fix android
|
4 years ago |
|
Mohammad Aljammal
|
05af339fed
|
Merge branch 'master' into 'development'
Master
See merge request Cloud_Solution/diplomatic-quarter!232
|
4 years ago |
|
Mohammad Aljammal
|
58c2401079
|
Merge branch 'pharmacy_merge' into 'master'
Pharmacy merge
See merge request Cloud_Solution/diplomatic-quarter!231
|
4 years ago |
|
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 |