312 Commits (e0ebb922ed4ebc5d759b2813822935642e316ba1)

Author	SHA1	Message	Date
Fatimah Alshammari	0f22a50a5d	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/profile/profile.dart	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
Sultan Khan	c65983bfdb	code merged	5 years ago
Zohaib Iqbal Kambrani	bbd953ae43	Order Delivery Driver tracking [inprogress]	5 years ago
Mohammad Aljammal	200334d8f8	Fix ER service	5 years ago
Zohaib Iqbal Kambrani	e2bce87e34	resolve merge conflicts.	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
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	5 years ago
Fatimah Alshammari	52fa0f6f89	fixed orders	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	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	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
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
Fatimah Alshammari	c0920e7099	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/widgets/pharmacy/product_tile.dart	5 years ago
Mohammad Aljammal	5e3f6363cf	fix issues	5 years ago
Mohammad Aljammal	754e60eb72	fix send email lab result	5 years ago
Zohaib Kambrani	57925e3b02	Geofence fixes by JobScheduler	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	9c12e949e8	hot fixes	5 years ago
Mohammad Aljammal	7167d58ce2	fix merge issues	5 years ago
Mohammad Aljammal	aa89a05f1d	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter ... Conflicts: ios/Flutter/.last_build_id lib/config/config.dart lib/config/localized_values.dart lib/config/shared_pref_kay.dart lib/core/service/client/base_app_client.dart lib/core/service/medical/prescriptions_service.dart lib/core/viewModels/project_view_model.dart lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart lib/pages/BookAppointment/BookConfirm.dart lib/pages/BookAppointment/DoctorProfile.dart lib/pages/DrawerPages/family/my-family.dart lib/pages/MyAppointments/MyAppointments.dart lib/pages/MyAppointments/models/ArrivedButtons.dart lib/pages/MyAppointments/widgets/AppointmentActions.dart lib/pages/MyAppointments/widgets/AppointmentCardView.dart lib/pages/ToDoList/ToDo.dart lib/pages/feedback/send_feedback_page.dart lib/pages/insurance/insurance_approval_screen.dart lib/pages/insurance/insurance_card_screen.dart lib/pages/landing/home_page.dart lib/pages/landing/landing_page.dart lib/pages/login/confirm-login.dart lib/pages/login/login.dart lib/pages/medical/balance/my_balance_page.dart lib/pages/medical/labs/laboratory_result_page.dart lib/pages/medical/labs/labs_home_page.dart lib/pages/medical/medical_profile_page.dart lib/pages/medical/patient_sick_leave_page.dart lib/pages/medical/prescriptions/prescription_details_page.dart lib/pages/medical/prescriptions/prescription_items_page.dart lib/pages/medical/radiology/radiology_details_page.dart lib/pages/medical/radiology/radiology_home_page.dart lib/pages/medical/reports/report_home_page.dart lib/pages/medical/reports/reports_page.dart lib/pages/pharmacies/pharmacies_list_screen.dart lib/pages/settings/profile_setting.dart lib/services/authentication/auth_provider.dart lib/uitl/translations_delegate_base.dart lib/widgets/buttons/floatingActionButton.dart lib/widgets/data_display/medical/LabResult/LabResultWidget.dart lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart lib/widgets/data_display/medical/doctor_card.dart lib/widgets/drawer/app_drawer_widget.dart lib/widgets/others/app_scaffold_widget.dart	5 years ago
mosazaid	359eba2da0	make some updates in firebase version and update gradle, finish review order	5 years ago
Fatimah Alshammari	4a84483698	fixed order details	5 years ago
Zohaib Kambrani	b7088f70cd	Merge master in to my branch with Geofence iOS	5 years ago
haroon amjad	051bd1e23f	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	5 years ago
haroon amjad	951d9b553f	fixes & updates	5 years ago
Mohammad Aljammal	b25bdbb6fa	fix LiveChatPage Service LabOrderResult MedicineSearch issues	5 years ago
mosazaid	6ac8d67b83	finish address add/edit/delete/select	5 years ago
Zohaib Kambrani	8d5d55a150	Geofencing in progress	5 years ago
Sultan Khan	ce7a64e86e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	5 years ago
haroon amjad	33956db22a	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # lib/config/config.dart	5 years ago
Mohammad Aljammal	9dfd8a71dc	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges ... Conflicts: lib/locator.dart lib/pages/DrawerPages/family/my-family.dart lib/pages/login/confirm-login.dart lib/pages/medical/medical_profile_page.dart lib/pages/medical/reports/report_home_page.dart lib/widgets/bottom_navigation/bottom_nav_bar.dart lib/widgets/drawer/app_drawer_widget.dart	5 years ago
haroon amjad	e495d3e5ad	Health Data integration implementing	5 years ago
Sultan Khan	542335364e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	5 years ago
enadhilal	9c55571072	Merge branch 'pharmacy' into enad_pharmacy2	5 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	5 years ago
enadhilal	888a74fb9b	add these pages ... ​Product Tile Component Product Detail Page ​Wishlist Page ​Reviews Page Brands Page + Search	5 years ago
Mohammad Aljammal	459ba828d9	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter ... Conflicts: lib/config/shared_pref_kay.dart lib/core/service/client/base_app_client.dart lib/locator.dart lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart lib/pages/landing/home_page.dart lib/pages/medical/vital_sign/vital_sign_item.dart lib/routes.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart pubspec.yaml	5 years ago
Fatimah Alshammari	706980248a	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/config/config.dart # lib/pages/landing/home_page.dart	5 years ago
Mohammad Aljammal	77dcb918c3	Revert "Merge branch 'pharmacy-hussam' into 'master'" ... This reverts merge request !149	5 years ago
Fatimah Alshammari	9b8103bfd6	fixe order and order details	5 years ago
Sultan Khan	af1c59394c	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	5 years ago
hussam al-habibeh	5dc3c53550	mousa and hussam branch	5 years ago
hussam al-habibeh	a1906a4072	Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/locator.dart lib/pages/landing/home_page.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart pubspec.yaml	5 years ago
hussam al-habibeh	800565407d	12/6	5 years ago
hussam al-habibeh	8b8207cb0d	search	5 years ago
Sultan Khan	f5b7d35f23	bug fixes	5 years ago
hussam al-habibeh	64cbae3602	Search	5 years ago
haroon amjad	47b030eb82	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # ios/Flutter/.last_build_id # lib/config/config.dart # lib/uitl/translations_delegate_base.dart	5 years ago
haroon amjad	7edb0c8009	Doctor rating dialog revamped	5 years ago
Mohammad Aljammal	dc898a799d	Add Privileges	5 years ago
Sultan Khan	98f84c2161	voice search in progress	5 years ago
Zohaib Kambrani	1155466d19	Packages and Offer Slider at home	5 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	5 years ago
mosazaid	4e5d6a9a00	finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished	5 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	5 years ago
Sultan Khan	8de838a6dc	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	5 years ago
Sultan Khan	2fb0ccfdbd	Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	5 years ago
Mohammad Aljammal	2185f5ce11	Merge branch 'hhc_cmc' into 'master' ... Hhc cmc See merge request Cloud_Solution/diplomatic-quarter!138	5 years ago
Elham Rababah	05deaa6322	Address Added Successfully	5 years ago
Sultan Khan	7d3c1ac852	weather indicator updated	5 years ago
Zohaib Kambrani	27182ee8db	no message	5 years ago
Mohammad Aljammal	54d8965773	done child Vaccination	5 years ago
haroon amjad	a03d5c6d57	App initial release to stores	5 years ago
Sultan Khan	909401cc7e	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	5 years ago
Elham Rababah	7aa7af6de7	finish CMC module	5 years ago
Elham Rababah	3ef22be7da	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc ... Conflicts: lib/config/config.dart	5 years ago
Elham Rababah	a87855f445	Fix issues on hhc module	5 years ago
Sultan Khan	0f80224016	Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	5 years ago
Mohammad Aljammal	a556e8c1f8	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter ... Conflicts: lib/config/config.dart lib/pages/landing/home_page.dart lib/pages/landing/landing_page.dart	5 years ago
Mohammad Aljammal	482ec536de	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing ... Conflicts: lib/config/config.dart	5 years ago
Mohammad Aljammal	b6d2878cf1	add Radiology translations and colors	5 years ago
Fatimah Alshammari	d328c74fc4	fix order and orderdetails	5 years ago
Sultan Khan	1b678e0aca	fingerprint	5 years ago
Sultan Khan	24b7bca471	no message	5 years ago
Sultan Khan	8429f83d7c	registration done	5 years ago
Mohammad Aljammal	f70ca95a38	fix merge issues	5 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	5 years ago
Mohammad Aljammal	67cc5e2033	fix Prescriptions	5 years ago
Sultan Khan	30a8e24521	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	5 years ago
Mohammad Aljmma	501692587f	change the base Url	5 years ago
Mohammad Aljmma	a9b11a6b03	fix lab result	5 years ago
Mohammad Aljmma	ed7b9d609f	fix lab result	5 years ago
Sultan Khan	bedafa24cd	insurance details	5 years ago
hussam al-habibeh	69ea8b7bd7	daynmic products listing	5 years ago
Sultan Khan	d1336eec8b	login type	5 years ago
Sultan Khan	f05b235cd0	login issue	5 years ago
Sultan Khan	cced69502a	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	5 years ago
Sultan Khan	aa8f9f18e1	forgot password	5 years ago
Fatimah Alshammari	ddf032bb47	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # android/app/build.gradle # android/app/src/main/AndroidManifest.xml # lib/config/config.dart # lib/config/localized_values.dart # lib/pages/landing/home_page.dart # lib/uitl/translations_delegate_base.dart	5 years ago