426 Commits (a613fe08e46d4fb2e72d6a7b2329e50152205f75)

Author	SHA1	Message	Date
Mohammad Aljammal	4d8f42b517	fix issues vital sign issue	4 years ago
Mohammad Aljammal	4f015a1cda	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes	4 years ago
Mohammad Aljammal	f6983c138a	fix issues	4 years ago
Sultan Khan	37ab778fd0	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	b505ed1be7	blood type added	4 years ago
Mohammad Aljammal	09a85d9127	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes	4 years ago
Mohammad Aljammal	9c12e949e8	hot fixes	4 years ago
Fatimah Alshammari	e5bf7acc52	Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima ... # Conflicts: # lib/core/viewModels/pharmacyModule/order_model_view_model.dart # lib/pages/pharmacy/order/OrderDetails.dart # lib/widgets/pharmacy/product_tile.dart	4 years ago
Fatimah Alshammari	fda101840a	fixed order isuues	4 years ago
Sultan Khan	6b1e7587a8	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	a0baaac314	bug fixes	4 years ago
Mohammad Aljammal	9c18c69d90	hot fixes	4 years ago
Sultan Khan	040c8f38ab	hot fixes	4 years ago
Mohammad Aljammal	3c2af11084	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master ... Conflicts: lib/pages/landing/landing_page.dart	4 years ago
Zohaib Kambrani	d8996cf879	Geofence Android Finished	4 years ago
Mohammad Aljammal	6d7cb1b970	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master ... Conflicts: ios/Runner.xcodeproj/project.pbxproj lib/core/service/AuthenticatedUserObject.dart lib/pages/landing/landing_page.dart lib/pages/login/login.dart lib/widgets/drawer/app_drawer_widget.dart	4 years ago
Mohammad Aljammal	4e2979cd64	fix merge issues	4 years ago
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
mosazaid	359eba2da0	make some updates in firebase version and update gradle, finish review order	4 years ago
Zohaib Kambrani	1dc9400ffc	Geofencing work in progress on android	4 years ago
Mohammad Aljammal	b29fdbb7d0	fix home issues	4 years ago
Mohammad Aljammal	02d72fa27c	fix issues	4 years ago
Fatimah Alshammari	4a84483698	fixed order details	4 years ago
Mohammad Aljammal	f38f53587b	fix issues	4 years ago
Zohaib Kambrani	78928335ef	Geofences Login check (unregister/register geozones on logout/logout)	4 years ago
Zohaib Kambrani	6f6ab8d987	no message	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
Zohaib Kambrani	b7088f70cd	Merge master in to my branch with Geofence iOS	4 years ago
Haroon Amjad	5606c88715	hot fixes	4 years ago
Haroon Amjad	81b51bef51	Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon	4 years ago
Mohammad Aljammal	4e823c2be4	fix chart and duplicated data in Patient Lab Result	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
Zohaib Kambrani	67f4b4e167	iOS Geofence in progress	4 years ago
Zohaib Kambrani	8457972fda	no message	4 years ago
Sultan Khan	2c50402aa8	language issue fixed	4 years ago
Mohammad Aljammal	b25bdbb6fa	fix LiveChatPage Service LabOrderResult MedicineSearch issues	4 years ago
Zohaib Kambrani	92ba977fca	no message	4 years ago
mosazaid	6ac8d67b83	finish address add/edit/delete/select	4 years ago
Zohaib Kambrani	8d5d55a150	Geofencing in progress	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
Mohammad Aljammal	62b923b25e	fix send rad report email	4 years ago
Mohammad Aljammal	9cec304712	Merge branch 'sultan' into 'diplomatic-quarter-live' ... bug fixes See merge request Cloud_Solution/diplomatic-quarter!168	4 years ago
Sultan Khan	21ccf1ef86	bug fixes	4 years ago
Sultan Khan	ce7a64e86e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 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	4 years ago
Mohammad Aljammal	4d203c8a5b	fix LabResult	4 years ago
Sultan Khan	542335364e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
enadhilal	9c55571072	Merge branch 'pharmacy' into enad_pharmacy2	4 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	4 years ago
enadhilal	888a74fb9b	add these pages ... ​Product Tile Component Product Detail Page ​Wishlist Page ​Reviews Page Brands Page + Search	4 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	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
Mohammad Aljammal	77dcb918c3	Revert "Merge branch 'pharmacy-hussam' into 'master'" ... This reverts merge request !149	4 years ago
Fatimah Alshammari	9b8103bfd6	fixe order and order details	4 years ago
Sultan Khan	af1c59394c	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	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	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
hussam al-habibeh	800565407d	12/6	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
umasoodch	b5413d1749	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
mosazaid	709ba2ce97	create terms-condition in pharmacy order page	4 years ago
Sultan Khan	f5b7d35f23	bug fixes	4 years ago
Sultan Khan	e3e868e47c	flutter tts updated	4 years ago
Sultan Khan	8c5746f7b1	bug fixes	4 years ago
hussam al-habibeh	64cbae3602	Search	4 years ago
Sultan Khan	81c8239412	bug fixes	4 years ago
mosazaid	35d0d3e441	finsi lakum points task	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
Mohammad Aljammal	dc898a799d	Add Privileges	4 years ago
Sultan Khan	3ab513d9d0	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	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
haroon amjad	82e23efd32	working on ereferral	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
Sultan Khan	8de838a6dc	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	2fb0ccfdbd	Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	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
Elham Rababah	05deaa6322	Address Added Successfully	4 years ago
Elham Rababah	68e4b92717	Address Added Successfully	4 years ago
Sultan Khan	de2a5e55eb	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	7d3c1ac852	weather indicator updated	4 years ago
Sultan Khan	648d9d245d	health weather indicator	4 years ago
Zohaib Kambrani	27182ee8db	no message	4 years ago
Elham Rababah	ed56476d81	second step from location fixes	4 years ago
Mohammad Aljammal	54d8965773	done child Vaccination	4 years ago
haroon amjad	97b8aeeff5	Version Control finished	4 years ago
Sultan Khan	909401cc7e	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	a9cb645833	health weather indicator	4 years ago
Elham Rababah	7aa7af6de7	finish CMC module	4 years ago
haroon amjad	92db2b2be9	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	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
Sultan Khan	340b9770c8	login	4 years ago
Sultan Khan	799fca346b	health weather indicator	4 years ago
Sultan Khan	8612ae91c4	sultan	4 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	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
Fatimah Alshammari	d328c74fc4	fix order and orderdetails	4 years ago
Mohammad Aljammal	0ac599ea1c	fix vital Sign	4 years ago
haroon amjad	d284ceac04	advance payment & payment flow issues fixed	4 years ago
Sultan Khan	391e178484	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	8d499704dc	family file changes	4 years ago
Mohammad Aljammal	91cada6901	fix Advance Payment	4 years ago
Mohammad Aljammal	dcbc0de69f	fix prescription	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	67cc5e2033	fix Prescriptions	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
Sultan Khan	30a8e24521	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Mohammad Aljammal	b785f87dac	fix App drawer after logout	4 years ago
Mohammad Aljammal	ddc7eca605	fix Insurance Cards	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
Mohammad Aljmma	a9b11a6b03	fix lab result	4 years ago
Zohaib Kambrani	69d1e4bb0b	no message	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
Mohammad Aljmma	ed7b9d609f	fix lab result	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
Sultan Khan	1f4f81b454	insurance card details	4 years ago
Sultan Khan	bedafa24cd	insurance details	4 years ago
Mohammad Aljmma	8f38dc6077	fix issue #24	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	a1684bdd9e	fix issue #17 & 18	4 years ago
Mohammad Aljmma	e1f6ef5e5b	fix Prescriptions history	4 years ago
hussam al-habibeh	69ea8b7bd7	daynmic products listing	4 years ago
Sultan Khan	d1336eec8b	login type	4 years ago
Sultan Khan	f05b235cd0	login issue	4 years ago
haroon amjad	506e32e8c8	Payment issues resolved	4 years ago
haroon amjad	05ad8f8db5	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
Mohammad Aljmma	a077d87dd8	fix user authentication data	4 years ago
haroon amjad	ffbc7c4af4	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # lib/pages/landing/home_page.dart	4 years ago
Mohammad Aljmma	7d2f1cf318	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication	4 years ago
Mohammad Aljmma	570aa514cd	fix user authentication data	4 years ago
haroon amjad	b7b7ead3ba	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	f0897881d1	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
Elham Rababah	124d388ee1	Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page ... Conflicts: lib/pages/BookAppointment/components/DocAvailableAppointments.dart lib/pages/Covid-DriveThru/Covid-TimeSlots.dart	4 years ago
Mohammad Aljmma	4a4d5248a2	fix status issue	4 years ago
haroon amjad	5020c24e8b	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # lib/pages/landing/landing_page.dart # lib/pages/login/confirm-login.dart # lib/services/authentication/auth_provider.dart	4 years ago
Elham Rababah	5ed4d76a54	Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago