Commit Graph

816 Commits (3fb522e15f6232598e2c75d52338cc49c85c0437)

Author SHA1 Message Date
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 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
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
Mohammad Aljammal 6827efc1b6 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge 5 years ago
Mohammad Aljammal d7fe93b3f3 Merge branch 'pharmacy-hussam' into 'pharmacy'
parent_categorise_page update

See merge request Cloud_Solution/diplomatic-quarter!226
5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 1968eb4682 return privilege 5 years ago
Mohammad Aljammal 952e106531 return privilege 5 years ago
Mohammad Aljammal f77d2b497e fix issues 5 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
5 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Mohammad Aljammal 6bda03e935 hot fixing 5 years ago
Sultan Khan e6a94f8014 login design 5 years ago
Sultan Khan b992978af4 login 5 years ago
Sultan Khan 764e706000 dashboard issue fixed 5 years ago
Sultan Khan c01246acf0 hot fix 5 years ago
Sultan Khan 2b48578e07 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 016dffcb87 change 5 years ago
Mohammad Aljammal 4263672f00 fim last vital sign data 5 years ago
Mohammad Aljammal 80da19555c Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!218
5 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 5 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari 5fa5e9b7c8 fixed orders and profile 5 years ago
Mohammad Aljammal 5e3f6363cf fix issues 5 years ago
Mohammad Aljammal 754e60eb72 fix send email lab result 5 years ago
Sultan Khan 6b4bae7370 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 827768e96d language change 5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
Mohammad Aljammal 5c8e43c163 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Sultan Khan 8becd4f920 login issue fixed 5 years ago
Sultan Khan 3edae19ad6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan c9538c6a84 family files 5 years ago
Mohammad Aljammal 33c61afd2a add powered by 5 years ago
Mohammad Aljammal 5e29dff448 fix issues insurance and medical profile order 5 years ago
Sultan Khan 355286768a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 73c8e00852 bug fixes 5 years ago
Haroon Amjad b0ea1fc262 updates & fixes 5 years ago
Sultan Khan 18f492e52f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan d53031b0e6 blood type update for family files 5 years ago
Mohammad Aljammal b9958acd53 fix issues 5 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 5 years ago
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 5 years ago
Mohammad Aljammal 4f015a1cda Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal f6983c138a fix issues 5 years ago
Sultan Khan 37ab778fd0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan b505ed1be7 blood type added 5 years ago
Mohammad Aljammal 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago