772 Commits (8eda45d63724a6574023fd820911451019ab8643)

Author	SHA1	Message	Date
Mohammad Aljammal	3e441c55b2	fix bottom nav bar	4 years ago
Mohammad Aljammal	9d8c1ddf63	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker ... Conflicts: lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	484cca086e	fix my my Trackers	4 years ago
haroon amjad	ab158e14e9	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	7c538b350f	LiveCare Scheduling finalized, Appointments in ToDo list categorized	4 years ago
hussam al-habibeh	97919c217f	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago
hussam al-habibeh	1ce0ef7b6c	health-converter fix	4 years ago
haroon amjad	dde10cd27b	working in LiveCare Scheduling	4 years ago
Mohammad Aljammal	db2376f50c	fix blood and weight on my trackers	4 years ago
haroon amjad	6945230965	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/pages/Covid-DriveThru/covid-drivethru-location.dart # lib/pages/landing/home_page.dart # lib/pages/medical/smart_watch_health_data/health_data_list.dart # lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart # lib/uitl/translations_delegate_base.dart # pubspec.yaml	4 years ago
mosazaid	38d52b52c8	Merge branch 'development' into fix_design ... # Conflicts: # lib/config/localized_values.dart # lib/locator.dart	4 years ago
mosazaid	174534d8a5	fix Blood donation functionality and design	4 years ago
Mohammad Aljammal	405f67be1e	Merge branch 'pharmacy-Fatima' into 'development' ... Pharmacy fatima See merge request Cloud_Solution/diplomatic-quarter!249	4 years ago
Fatimah Alshammari	7a516cae51	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/order/Order.dart # lib/pages/pharmacy/order/OrderDetails.dart	4 years ago
Mohammad Aljammal	f883e1bd78	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker ... Conflicts: lib/config/localized_values.dart	4 years ago
Mohammad Aljammal	0b1014a91c	fix blood sugar service on my tracker	4 years ago
Fatimah Alshammari	0f22a50a5d	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/profile/profile.dart	4 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	4 years ago
Zohaib Iqbal Kambrani	bbd953ae43	Order Delivery Driver tracking [inprogress]	4 years ago
mosazaid	3a45239059	Merge branch 'development' into fix_design ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
mosazaid	f5d478fd27	re-design child vaccine and fix some funcrionalities	4 years ago
Mohammad Aljammal	4457b5f109	add translation to ER service	4 years ago
Mohammad Aljammal	200334d8f8	Fix ER service	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	b63025a9b3	return CMC HHC	4 years ago
mosazaid	5bcc67b77d	Nearest Er fix design	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
Zohaib Iqbal Kambrani	e2bce87e34	resolve merge conflicts.	4 years ago
Mohammad Aljammal	30ddea6419	hot fixing	4 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	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
Fatimah Alshammari	a1b2709ac8	fixed orders	4 years ago
Fatimah Alshammari	ba4003cb56	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/locator.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacy/profile/profile.dart	4 years ago
Fatimah Alshammari	52fa0f6f89	fixed orders	4 years ago
mosazaid	2843b1393e	some design enhancments	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	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
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	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