255 Commits (60648d368f29c3e54132836d9157e8c471edc3ac)

Author	SHA1	Message	Date
Mohammad Aljammal	7167d58ce2	fix merge issues	4 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	4 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	4 years ago
Mohammad Aljammal	02d72fa27c	fix issues	4 years ago
Fatimah Alshammari	4a84483698	fixed order details	4 years ago
Sultan Khan	0f594059b5	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
haroon amjad	a7dc2fdfd1	Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon	4 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	4 years ago
Sultan Khan	3aa592e2b0	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	b759758a68	bug fixes	4 years ago
Mohammad Aljammal	f38f53587b	fix issues	4 years ago
Haroon Amjad	3308aa47e1	fixes	4 years ago
Mohammad Aljammal	19f12116c4	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix	4 years ago
Mohammad Aljammal	de1e352e98	fix charts and vital sign	4 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	4 years ago
Haroon Amjad	5606c88715	hot fixes	4 years ago
Mohammad Aljammal	92e6275162	Add Confirm send email dialog	4 years ago
haroon amjad	051bd1e23f	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
Mohammad Aljammal	97776ce99b	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix	4 years ago
Mohammad Aljammal	b25bdbb6fa	fix LiveChatPage Service LabOrderResult MedicineSearch issues	4 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	4 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	4 years ago
Mohammad Aljammal	2f77592bac	fix Prescriptions Service and design issues	4 years ago
haroon amjad	740a294867	Translation & bug fixes	4 years ago
Sultan Khan	c813deea29	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 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	4 years ago
Sultan Khan	e28209d4e8	bug fixes	4 years ago
Haroon Amjad	9d3c64200e	fixes	4 years ago
Mohammad Aljammal	eca2266f7b	hot fixing	4 years ago
Mohammad Aljammal	4d203c8a5b	fix LabResult	4 years ago
Mohammad Aljammal	554ed1b50a	fix insurance update	4 years ago
mosazaid	378562b781	adding some changes in order pages like translate texts	4 years ago
Fatimah Alshammari	706980248a	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/config/config.dart # lib/pages/landing/home_page.dart	4 years ago
Fatimah Alshammari	9b8103bfd6	fixe order and order details	4 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	4 years ago
Mohammad Aljammal	4e2c955b09	add missing translation	4 years ago
haroon amjad	dfa1952f4d	Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app	4 years ago
hussam al-habibeh	5dc3c53550	mousa and hussam branch	4 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	4 years ago
mosazaid	4c9a1862d2	make pharmacy home page load data even without login, and some mini changes	4 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	4 years ago
mosazaid	7ee7ef58c4	working on dynamic title on pharmacy	4 years ago
umasoodch	b5413d1749	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
hussam al-habibeh	64cbae3602	Search	4 years ago
Sultan Khan	81c8239412	bug fixes	4 years ago
Mohammad Aljammal	1c23e28081	fix merge issues	4 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	4 years ago
Mohammad Aljammal	269f682bd5	Added info images description	4 years ago
mosazaid	35d0d3e441	finsi lakum points task	4 years ago
haroon amjad	f1a8e09a59	Added info images description	4 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	4 years ago
haroon amjad	7edb0c8009	Doctor rating dialog revamped	4 years ago
Mohammad Aljammal	3daef6e53f	add images info	4 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	4 years ago
Elham Rababah	ea195ea9bf	Finish translate CMC HHC	4 years ago
haroon amjad	65fbd7af8e	referral finalised	4 years ago
Zohaib Kambrani	1155466d19	Packages and Offer Slider at home	4 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	4 years ago
mosazaid	4e5d6a9a00	finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished	4 years ago
Elham Rababah	5bf63174c9	First step from translations	4 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	4 years ago
haroon amjad	6846a8501a	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	0181043da8	Ereferral fixes, smartwatch health data integration	4 years ago
Mohammad Aljammal	2185f5ce11	Merge branch 'hhc_cmc' into 'master' ... Hhc cmc See merge request Cloud_Solution/diplomatic-quarter!138	4 years ago
Zohaib Kambrani	27182ee8db	no message	4 years ago
Mohammad Aljammal	54d8965773	done child Vaccination	4 years ago
haroon amjad	97b8aeeff5	Version Control finished	4 years ago
Elham Rababah	3ef22be7da	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc ... Conflicts: lib/config/config.dart	4 years ago
Elham Rababah	a87855f445	Fix issues on hhc module	4 years ago
Mohammad Aljammal	49974f81db	add translations to child Vaccination	4 years ago
haroon amjad	e5feef8a9d	Updates & UI Fixes	4 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	4 years ago
Mohammad Aljammal	b6d2878cf1	add Radiology translations and colors	4 years ago
Fatimah Alshammari	d328c74fc4	fix order and orderdetails	4 years ago
Mohammad Aljammal	b504f379de	fix lab result translations and colors	4 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	4 years ago
Mohammad Aljammal	0966269537	Merge branch 'sultan' into 'diplomatic-quarter-live' ... Sultan See merge request Cloud_Solution/diplomatic-quarter!116	4 years ago
Mohammad Aljammal	3c1257b379	fix Medicine Search	4 years ago
Sultan Khan	30a8e24521	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	91be66ecdd	family file changes	4 years ago
Mohammad Aljmma	6523a1dea9	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues ... Conflicts: lib/config/localized_values.dart	4 years ago
Sultan Khan	3589b21590	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Mohammad Aljmma	770d28033d	fix issues#26 & 27 & 28	4 years ago
haroon amjad	b81af62551	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	b89c1f03b3	language translation fixes	4 years ago
Mohammad Aljmma	8f38dc6077	fix issue #24	4 years ago
Sultan Khan	536682e953	merge	4 years ago
Sultan Khan	1eb6516ea6	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	3fef1b9d52	theme and login issues fixed	4 years ago
Mohammad Aljmma	59defa4532	fix issue #15	4 years ago
Mohammad Aljmma	5e8b61bf2d	fix issue #13	4 years ago
Mohammad Aljmma	741126102d	fix issue #11	4 years ago
Mohammad Aljmma	e1f6ef5e5b	fix Prescriptions history	4 years ago
Sultan Khan	283473a06a	theme changes	4 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	4 years ago
Fatimah Alshammari	f137bd44c0	created order and order details UI pages	4 years ago
Sultan Khan	4976870d2e	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	875bf10c73	settings page added	4 years ago
Mohammad Aljmma	6a83538544	add info for Medical	4 years ago
Elham Rababah	64f970c40c	Fix issues after the merge	4 years ago