Fatimah Alshammari
|
747763c4be
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
Sultan Khan
|
e61c26b853
|
Auto SMS, Themes, Voice Command
|
4 years ago |
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
4 years ago |
enadhilal
|
830e871e2c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
|
4 years ago |
Sultan Khan
|
d33918c932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Sultan Khan
|
9fca52efca
|
voice command
|
4 years ago |
Sultan Khan
|
eeb073fb17
|
voice command
|
4 years ago |
Sikander Saleem
|
aef4c7bfac
|
H2O feature improvement
|
4 years ago |
Sikander Saleem
|
3b4e791017
|
H2O feature improvement
|
4 years ago |
Mohammad Aljammal
|
db2376f50c
|
fix blood and weight on my trackers
|
4 years ago |
Mohammad Aljammal
|
30ddea6419
|
hot fixing
|
4 years ago |
mosazaid
|
2843b1393e
|
some design enhancments
|
4 years ago |
Mohammad Aljammal
|
72290f041f
|
fix design
|
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
|
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 |
Mohammad Aljammal
|
9c18c69d90
|
hot fixes
|
4 years ago |
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
554ed1b50a
|
fix insurance update
|
4 years ago |
enadhilal
|
727940c5c6
|
fixed merging issues
|
4 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
|
4 years ago |
enadhilal
|
888a74fb9b
|
add these pages
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
|
4 years ago |
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
4 years ago |
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
4 years ago |
Mohammad Aljammal
|
3daef6e53f
|
add images info
|
4 years ago |
mosazaid
|
98f660e29b
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
4 years ago |
umasoodch
|
0431eb1ac8
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
4 years ago |
Mohammad Aljammal
|
0d098def04
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
Conflicts:
assets/app_icons/config.json
assets/app_icons/fonts/DQIcons.ttf
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/d_q_icons_icons.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/uitl/utils.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Sultan Khan
|
bedafa24cd
|
insurance details
|
4 years ago |
haroon amjad
|
9868a43e7b
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
Mohammad Aljmma
|
6a83538544
|
add info for Medical
|
4 years ago |
Mohammad Aljmma
|
a077d87dd8
|
fix user authentication data
|
4 years ago |
Mohammad Aljmma
|
570aa514cd
|
fix user authentication data
|
4 years ago |
Mohammad Aljmma
|
747cffacfc
|
fix lab result
|
4 years ago |
mosazaid
|
11ff27bae3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
4 years ago |
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
4 years ago |
enadhilal
|
778e9fd8da
|
Merge branch 'pharmacy_module_feature_home_page' into enad_pharmacy2
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
4 years ago |
umasoodch
|
23083fd5ad
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
4 years ago |
Mohammad Aljmma
|
0b90d3c687
|
fix issues
|
4 years ago |
Mohammad Aljmma
|
894494ec4e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
ios/Flutter/.last_build_id
lib/main.dart
lib/pages/landing/home_page.dart
|
4 years ago |
Mohammad Aljmma
|
874de15040
|
change the home page design
|
4 years ago |
Sultan Khan
|
23b48485ed
|
voice command
|
4 years ago |
enadhilal
|
5445cced89
|
Merge branch 'master' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
enadhilal
|
068382e76f
|
add call for backend service
|
4 years ago |
Mohammad Aljammal
|
e025321c71
|
fix issues
|
4 years ago |
Mohammad Aljammal
|
29f0402cbd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
Conflicts:
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/pages/AlHabibMedicalService/ health_calculators.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/services/appointment_services/GetDoctorsList.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Sultan Khan
|
3ad928902b
|
voice command
|
4 years ago |