312 Commits (e0ebb922ed4ebc5d759b2813822935642e316ba1)

Author	SHA1	Message	Date
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	4457b5f109	add translation to ER service	5 years ago
Mohammad Aljammal	200334d8f8	Fix ER service	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
mosazaid	5bcc67b77d	Nearest Er fix design	5 years ago
Mohammad Aljammal	634c874eee	fix design issues	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	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	519a474d41	fix live care label and vital sign data	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	f6983c138a	fix issues	5 years ago
Mohammad Aljammal	9c12e949e8	hot fixes	5 years ago
Fatimah Alshammari	fda101840a	fixed order isuues	5 years ago
Mohammad Aljammal	9c18c69d90	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
Mohammad Aljammal	b29fdbb7d0	fix home issues	5 years ago
Mohammad Aljammal	d9759560c3	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix ... Conflicts: lib/config/localized_values.dart lib/pages/login/login.dart	5 years ago
Mohammad Aljammal	02d72fa27c	fix issues	5 years ago
Fatimah Alshammari	4a84483698	fixed order details	5 years ago
Sultan Khan	0f594059b5	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	5 years ago
haroon amjad	a7dc2fdfd1	Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon	5 years ago
haroon amjad	781fd1c287	Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	5 years ago
Sultan Khan	3aa592e2b0	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	5 years ago
Sultan Khan	b759758a68	bug fixes	5 years ago
Mohammad Aljammal	f38f53587b	fix issues	5 years ago
Haroon Amjad	3308aa47e1	fixes	5 years ago
Mohammad Aljammal	19f12116c4	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix	5 years ago
Mohammad Aljammal	de1e352e98	fix charts and vital sign	5 years ago
Haroon Amjad	c67d41701d	Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	5 years ago
Haroon Amjad	5606c88715	hot fixes	5 years ago
Mohammad Aljammal	92e6275162	Add Confirm send email dialog	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
Mohammad Aljammal	97776ce99b	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix	5 years ago
Mohammad Aljammal	b25bdbb6fa	fix LiveChatPage Service LabOrderResult MedicineSearch issues	5 years ago
haroon amjad	75de755ccd	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # lib/config/localized_values.dart # lib/pages/paymentService/payment_service.dart # lib/uitl/translations_delegate_base.dart	5 years ago
Mohammad Aljammal	a2ec01be5d	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix ... Conflicts: lib/config/localized_values.dart lib/pages/landing/home_page.dart lib/pages/medical/radiology/radiology_details_page.dart lib/uitl/translations_delegate_base.dart	5 years ago
Mohammad Aljammal	2f77592bac	fix Prescriptions Service and design issues	5 years ago
haroon amjad	740a294867	Translation & bug fixes	5 years ago
Sultan Khan	c813deea29	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	5 years ago
haroon amjad	d14e7e5223	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # lib/config/localized_values.dart # lib/pages/medical/radiology/radiology_details_page.dart # lib/uitl/translations_delegate_base.dart	5 years ago
Sultan Khan	e28209d4e8	bug fixes	5 years ago
Haroon Amjad	9d3c64200e	fixes	5 years ago
Mohammad Aljammal	eca2266f7b	hot fixing	5 years ago
Mohammad Aljammal	4d203c8a5b	fix LabResult	5 years ago
Mohammad Aljammal	554ed1b50a	fix insurance update	5 years ago
Sultan Khan	542335364e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	5 years ago
Sultan Khan	c050c3f189	voice command updated	5 years ago
mosazaid	378562b781	adding some changes in order pages like translate texts	5 years ago
Mohammad Aljammal	2e2a29145c	fix merge issues	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
Sultan Khan	496163a61a	voice command updated	5 years ago
Mohammad Aljammal	47e4b99f11	fix issues	5 years ago
Mohammad Aljammal	9e8def6584	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues ... Conflicts: lib/config/localized_values.dart	5 years ago
Mohammad Aljammal	4e2c955b09	add missing translation	5 years ago
haroon amjad	dfa1952f4d	Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app	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
haroon amjad	257dc3d76d	Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy' ... create terms-condition in pharmacy order page See merge request Cloud_Solution/diplomatic-quarter!154	5 years ago
mosazaid	7ee7ef58c4	working on dynamic title on pharmacy	5 years ago
umasoodch	b5413d1749	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	5 years ago
Sultan Khan	f5b7d35f23	bug fixes	5 years ago
Sultan Khan	8c5746f7b1	bug fixes	5 years ago
Sultan Khan	8d7cc20b70	localized value updated	5 years ago
Sultan Khan	321d31b3bd	voice search page updated	5 years ago
hussam al-habibeh	64cbae3602	Search	5 years ago
Sultan Khan	81c8239412	bug fixes	5 years ago
Mohammad Aljammal	1c23e28081	fix merge issues	5 years ago
Mohammad Aljammal	ced86de9fe	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info ... Conflicts: lib/config/localized_values.dart lib/pages/medical/balance/advance_payment_page.dart lib/pages/medical/balance/my_balance_page.dart lib/uitl/translations_delegate_base.dart	5 years ago
Mohammad Aljammal	269f682bd5	Added info images description	5 years ago
mosazaid	35d0d3e441	finsi lakum points task	5 years ago
haroon amjad	f1a8e09a59	Added info images description	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	3daef6e53f	add images info	5 years ago
Sultan Khan	3ab513d9d0	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	5 years ago
Elham Rababah	713e44cf8b	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	5 years ago
Elham Rababah	ea195ea9bf	Finish translate CMC HHC	5 years ago
haroon amjad	65fbd7af8e	referral finalised	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
Elham Rababah	5bf63174c9	First step from translations	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