1100 Commits (e13a13189c7752750702d868b2916b726965c99d)

Author	SHA1	Message	Date
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
Zohaib Kambrani	d8bd7d145d	no message	4 years ago
Mohammad Aljammal	a8b0af9ee1	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes	4 years ago
Mohammad Aljammal	9c18c69d90	hot fixes	4 years ago
haroon amjad	53282e3ae6	ToDo back issue fixed	4 years ago
haroon amjad	ac3bebd59e	Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon	4 years ago
haroon amjad	8c9762c24f	Fixes	4 years ago
Sultan Khan	073e79c325	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	040c8f38ab	hot fixes	4 years ago
Mohammad Aljammal	7bc8fdb819	fix merge issues	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	d28870a629	fix merge issues	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	a57d5eb69f	hot fixes	4 years ago
Mohammad Aljammal	d9a70e7f75	Merge branch 'hot_fix' into 'diplomatic-quarter-live' ... hot fixes See merge request Cloud_Solution/diplomatic-quarter!199	4 years ago
Mohammad Aljammal	8329c534a3	hot fixes	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
Sultan Khan	e312671e24	hot fixes	4 years ago
Sultan Khan	cf642da661	landing page	4 years ago
Sultan Khan	eec67ac930	big fixes	4 years ago
Sultan Khan	99ee5b4545	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Mohammad Aljammal	b29fdbb7d0	fix home issues	4 years ago
Sultan Khan	8a554aa2f8	auth services fixed	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	9a578cafc2	bug fixes	4 years ago
Sultan Khan	b759758a68	bug fixes	4 years ago
Mohammad Aljammal	3860a08b53	Merge branch 'hot_fix' into 'diplomatic-quarter-live' ... fix issues See merge request Cloud_Solution/diplomatic-quarter!188	4 years ago
Mohammad Aljammal	f38f53587b	fix issues	4 years ago
Haroon Amjad	3308aa47e1	fixes	4 years ago
Sultan Khan	9e3db622fa	login loader issue fixed	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	3122f2438b	fix import dialog	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	53775d113d	commented code offers and packages	4 years ago
Zohaib Kambrani	9947b30d3f	fix merge conflict	4 years ago
Zohaib Kambrani	9ea779e48a	no message	4 years ago
Zohaib Kambrani	b7088f70cd	Merge master in to my branch with Geofence iOS	4 years ago
haroon amjad	965c97d262	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	bf999e611b	my appointment fix	4 years ago
Sultan Khan	d779c6dd0a	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	a2e385f282	family file drawer	4 years ago
Haroon Amjad	b9269f525a	hot fixes	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	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
Mohammad Aljammal	4a43bcefe1	Merge branch 'hot_fix' into 'diplomatic-quarter-live' ... remove ErOptions See merge request Cloud_Solution/diplomatic-quarter!179	4 years ago
Mohammad Aljammal	a6d3fce6fc	remove ErOptions	4 years ago
Zohaib Kambrani	8457972fda	no message	4 years ago
haroon amjad	b13a56ffbd	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	951d9b553f	fixes & updates	4 years ago
Sultan Khan	71592adf32	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	1f0d01b6cc	language issue fixed	4 years ago
Sultan Khan	2c50402aa8	language issue fixed	4 years ago
haroon amjad	f394433b6e	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	9d046fd971	updates & fixes	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
Zohaib Kambrani	92ba977fca	no message	4 years ago
mosazaid	c058cf0e93	finish address add/edit/delete/select	4 years ago
Sultan Khan	557b8e814f	voice command	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
mosazaid	6ac8d67b83	finish address add/edit/delete/select	4 years ago
Zohaib Kambrani	c10d024700	no message	4 years ago
Mohammad Aljammal	08aa2de69b	fix Prescriptions Service and design issues	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
haroon amjad	740a294867	Translation & bug fixes	4 years ago
Mohammad Aljammal	62b923b25e	fix send rad report email	4 years ago
Mohammad Aljammal	5083080ba3	fix vital sign details	4 years ago
haroon amjad	1db5b15dcd	Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon	4 years ago
haroon amjad	9ecaaa1b12	radiology fix in appointment details	4 years ago
Sultan Khan	9d9d77ee3a	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
Sultan Khan	188b72bb90	voice command	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	9cec304712	Merge branch 'sultan' into 'diplomatic-quarter-live' ... bug fixes See merge request Cloud_Solution/diplomatic-quarter!168	4 years ago
Mohammad Aljammal	eca2266f7b	hot fixing	4 years ago
Sultan Khan	21ccf1ef86	bug fixes	4 years ago
Sultan Khan	7742313923	voice command	4 years ago
Sultan Khan	ce7a64e86e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
hussam al-habibeh	e85b21c08f	parent_categorise_page update	4 years ago
haroon amjad	c4bb75eab4	Doctor rating fixed	4 years ago
haroon amjad	8d20762050	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	33956db22a	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # lib/config/config.dart	4 years ago
haroon amjad	b55681a056	Working on steps tracking	4 years ago
Mohammad Aljammal	a1e92e1fdd	fix merge issue	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	9b8599a2cf	remove load user from SplashScreen	4 years ago
Mohammad Aljammal	4d203c8a5b	fix LabResult	4 years ago
haroon amjad	8cd3ae915b	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	468bb0356c	updates & fixes	4 years ago
Mohammad Aljammal	14f92f6c58	remove updated button	4 years ago
Mohammad Aljammal	554ed1b50a	fix insurance update	4 years ago
Sultan Khan	7f44677242	voice command priv	4 years ago
Mohammad Aljammal	9fecf8e89f	fix insurance update	4 years ago
Mohammad Aljammal	935e72975c	add new privilege	4 years ago
haroon amjad	e495d3e5ad	Health Data integration implementing	4 years ago
Sultan Khan	a004610ac3	voice command updatd	4 years ago
Sultan Khan	542335364e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	c050c3f189	voice command updated	4 years ago
Sultan Khan	f083912d43	voice command updated	4 years ago
enadhilal	727940c5c6	fixed merging issues	4 years ago
haroon amjad	cf6686e413	Merge branch 'master' into Haroon ... # Conflicts: # lib/config/localized_values.dart # lib/pages/Covid-DriveThru/covid-drivethru-location.dart # lib/uitl/translations_delegate_base.dart	4 years ago
mosazaid	378562b781	adding some changes in order pages like translate texts	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
Fatimah Alshammari	ed68eed9df	added links for profile	4 years ago
Mohammad Aljammal	2e2a29145c	fix merge issues	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
haroon amjad	59aba6608d	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
haroon amjad	a1f91d99b3	added countdown timer in my appointments	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
Sultan Khan	496163a61a	voice command updated	4 years ago
Mohammad Aljammal	47e4b99f11	fix issues	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	7f23f356f1	Merge branch 'sultan' into 'diplomatic-quarter-live' ... Sultan See merge request Cloud_Solution/diplomatic-quarter!151	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
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
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
mosazaid	709ba2ce97	create terms-condition in pharmacy order page	4 years ago
mosazaid	2a91ae787f	commit	4 years ago
Sultan Khan	92b0b6d6ea	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp ... # Conflicts: # lib/uitl/translations_delegate_base.dart	4 years ago
hussam al-habibeh	8b8207cb0d	search	4 years ago
Sultan Khan	e34a5c3c13	multiple login calls fixed	4 years ago
Sultan Khan	f5b7d35f23	bug fixes	4 years ago
Sultan Khan	a3e01ff938	flutter tts	4 years ago
Sultan Khan	e3e868e47c	flutter tts updated	4 years ago
Sultan Khan	8c5746f7b1	bug fixes	4 years ago
Sultan Khan	8d7cc20b70	localized value updated	4 years ago
Sultan Khan	321d31b3bd	voice search page updated	4 years ago
Sultan Khan	d69b3676a4	weather indicator in progress	4 years ago
hussam al-habibeh	64cbae3602	Search	4 years ago
Sultan Khan	81c8239412	bug fixes	4 years ago
Sultan Khan	fc0117754d	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	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
Sultan Khan	3a055aa02b	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	79c17de0de	ltr issue fixed	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
Sultan Khan	98f84c2161	voice search in progress	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	ff0d66ccdb	Covid test translations	4 years ago
haroon amjad	4f1f7dcefd	ereferral implementation completed	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	951c77feb5	working on lakum account	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
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	1e1677a365	naming issue fix	4 years ago
Elham Rababah	05deaa6322	Address Added Successfully	4 years ago
Sultan Khan	078183c1fb	not authenticated page updated	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
haroon amjad	a03d5c6d57	App initial release to stores	4 years ago
Sultan Khan	e7c862c801	health weather indicator	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
Sultan Khan	19d6057f66	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	fd80afeb5a	finish hhc module	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
Sultan Khan	5e6bcadec0	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	603833db37	login changes	4 years ago
Sultan Khan	340b9770c8	login	4 years ago
haroon amjad	e5feef8a9d	Updates & UI Fixes	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	fa01d132c7	merger DQ live and fix some issues on Child Vaccines	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
haroon amjad	01512e6332	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 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	4 years ago
Mohammad Aljammal	b6d2878cf1	add Radiology translations and colors	4 years ago
Fatimah Alshammari	d328c74fc4	fix order and orderdetails	4 years ago
Sultan Khan	22676fcbd1	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	5bb780c4ac	push	4 years ago
haroon amjad	ebb8a8fa2c	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
Mohammad Aljammal	d0891ba16b	Merge branch 'hot_fixing' into 'diplomatic-quarter-live' ... fix lab result translations and colors See merge request Cloud_Solution/diplomatic-quarter!128	4 years ago
Mohammad Aljammal	b504f379de	fix lab result translations and colors	4 years ago
Mohammad Aljammal	2731c5b1d4	Merge branch 'sultan' into 'diplomatic-quarter-live' ... Sultan See merge request Cloud_Solution/diplomatic-quarter!127	4 years ago
Sultan Khan	d6a0188c76	fingerprint	4 years ago
Sultan Khan	7c33c06c0c	fingerprint	4 years ago
Sultan Khan	1b678e0aca	fingerprint	4 years ago
Sultan Khan	6a14214a0f	no message	4 years ago
Sultan Khan	24b7bca471	no message	4 years ago
haroon amjad	c74ac3b7ca	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	85062859c8	updates	4 years ago
Mohammad Aljammal	0ac599ea1c	fix vital Sign	4 years ago
haroon amjad	10025103ac	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	21c7c94ef2	updates & fixes	4 years ago
Sultan Khan	b61e734f80	feedback permission	4 years ago
Sultan Khan	6bbdf05f90	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	857fc813cd	button feedback	4 years ago
Sultan Khan	571bda9100	permission	4 years ago
haroon amjad	d284ceac04	advance payment & payment flow issues fixed	4 years ago
Sultan Khan	8429f83d7c	registration done	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	f70ca95a38	fix merge issues	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	939840bbe7	fix master	4 years ago
Mohammad Aljammal	67cc5e2033	fix Prescriptions	4 years ago
Sultan Khan	2f454055b9	login fixed	4 years ago
Sultan Khan	18a2393d92	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	6e152951b4	notification count	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	d2f391ab7f	setting page inprogress	4 years ago
Sultan Khan	4c8c4e3725	setting page inprogress	4 years ago
Sultan Khan	0ed29be214	launch	4 years ago
Sultan Khan	00b0154987	my family	4 years ago
Mohammad Aljammal	3c1257b379	fix Medicine Search	4 years ago
Zohaib Kambrani	8fcf1b6708	Swipe the Native loading « arguments	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 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	501692587f	change the base Url	4 years ago
Mohammad Aljmma	a9b11a6b03	fix lab result	4 years ago
Sultan Khan	fdef34a394	viral sign issue	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	431306f0e1	insurance details	4 years ago
Sultan Khan	1f4f81b454	insurance card details	4 years ago
Sultan Khan	bedafa24cd	insurance details	4 years ago
Sultan Khan	d81cc7119d	insurance details	4 years ago
Mohammad Aljmma	8f38dc6077	fix issue #24	4 years ago
Sultan Khan	a16145d7f1	bugfixes	4 years ago
Sultan Khan	0eedb788c3	register page	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	a1684bdd9e	fix issue #17 & 18	4 years ago
Mohammad Aljmma	e42ebfbf64	fix issue #16	4 years ago
Mohammad Aljmma	59defa4532	fix issue #15	4 years ago
Mohammad Aljmma	97a8fe4f9b	fix issue #14	4 years ago
Mohammad Aljmma	5e8b61bf2d	fix issue #13	4 years ago
Mohammad Aljmma	0f938fafd2	fix issue #12	4 years ago
Mohammad Aljmma	741126102d	fix issue #11	4 years ago
Mohammad Aljmma	fdeac4823e	fix issue #10	4 years ago
Mohammad Aljmma	179df475b4	fix issue #9	4 years ago
Mohammad Aljmma	20ece68ddb	fix issue # 6 & 7 & 8	4 years ago
Mohammad Aljmma	216c5609c6	fix issue # 6 & 7 & 8	4 years ago
Mohammad Aljmma	b913e5a7b7	fix issue#6	4 years ago
Mohammad Aljmma	7b55454fde	fix issue#5	4 years ago
Mohammad Aljmma	a742f896be	fix issue#4	4 years ago
Mohammad Aljmma	bfaacb2719	fix issue#3	4 years ago
Mohammad Aljmma	5b3a4e674d	fix issue#2	4 years ago
Mohammad Aljmma	27594f15b8	fix issue#1	4 years ago
Mohammad Aljmma	e1f6ef5e5b	fix Prescriptions history	4 years ago
Sultan Khan	58b1f648c1	setting theme	4 years ago
hussam al-habibeh	69ea8b7bd7	daynmic products listing	4 years ago
Sultan Khan	283473a06a	theme changes	4 years ago
Sultan Khan	d1336eec8b	login type	4 years ago
Sultan Khan	c00391d3e5	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
haroon amjad	9096ccd4d4	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
Mohammad Aljmma	d76b679a7f	fix issues	4 years ago
Mohammad Aljmma	6181e52ef1	fix authenticated user data	4 years ago
Sultan Khan	f05b235cd0	login issue	4 years ago
haroon amjad	2e484d7535	QR Code loading issue resolved	4 years ago
Zohaib Kambrani	0c71fbad5f	no message	4 years ago
Sultan Khan	cced69502a	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
haroon amjad	6062716209	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
haroon amjad	10efccbce8	my appointment fixes	4 years ago
Sultan Khan	aec2ab75d0	settings update	4 years ago
Sultan Khan	aa8f9f18e1	forgot password	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
Mohammad Aljmma	981020fce5	fix my family issues	4 years ago
Mohammad Aljmma	1111f26a9d	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_family	4 years ago
haroon amjad	94fb41581e	config update	4 years ago
haroon amjad	9868a43e7b	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/config.dart # lib/core/service/client/base_app_client.dart # lib/pages/landing/home_page.dart	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
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
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	ee67852970	Bottom navbar count & ToDo list fixed	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
haroon amjad	d75e5caf08	fixed appointment online checkIn issue	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
Elham Rababah	64f970c40c	Fix issues after the merge	4 years ago