Commit Graph

843 Commits (1ce0ef7b6cb2085da8c90ca76c4ded4cafed5343)

Author SHA1 Message Date
hussam al-habibeh 1ce0ef7b6c health-converter fix 5 years ago
Zohaib Iqbal Kambrani 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
5 years ago
Zohaib Iqbal Kambrani bbd953ae43 Order Delivery Driver tracking [inprogress] 5 years ago
mosazaid 3a45239059 Merge branch 'development' into fix_design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid f5d478fd27 re-design child vaccine and fix some funcrionalities 5 years ago
Mohammad Aljammal 200334d8f8 Fix ER service 5 years ago
Elham Rababah 4ecce79258 first step from fix CMC 5 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
5 years ago
Elham Rababah d7a046f9ca fix issue on cmc 5 years ago
Mohammad Aljammal 1cb5e250ed Merge branch 'fix_design' into 'development'
Fix design

See merge request Cloud_Solution/diplomatic-quarter!241
5 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 5 years ago
mosazaid 5bcc67b77d Nearest Er fix design 5 years ago
mosazaid 01bfe84644 solving NearestEr design problem 5 years ago
mosazaid e71a56ed51 Merge branch 'development' into fix_design 5 years ago
mosazaid d2e1a323ce simple fix 5 years ago
Zohaib Iqbal Kambrani e2bce87e34 resolve merge conflicts. 5 years ago
Mohammad Aljammal 30ddea6419 hot fixing 5 years ago
Zohaib Iqbal Kambrani 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
5 years ago
Mohammad Aljammal ed729689a9 Merge branch 'design_issues' into 'development'
fix design issues

See merge request Cloud_Solution/diplomatic-quarter!237
5 years ago
Mohammad Aljammal 634c874eee fix design issues 5 years ago
mosazaid 2843b1393e some design enhancments 5 years ago
Mohammad Aljammal 72290f041f fix design 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 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
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