405 Commits (3a40eb92be5b3aae3c89508880855c588a77c27e)

Author	SHA1	Message	Date
Sultan Khan	86cf9300e1	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp ... * 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter: (136 commits) 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 some design enhancments fix design fix android fix merge issues fix merge issues commit fix merge issues change color return privilege return privilege fix issues ...	4 years ago
Elham Rababah	d7a046f9ca	fix issue on cmc	4 years ago
Zohaib Iqbal Kambrani	e2bce87e34	resolve merge conflicts.	4 years ago
Mohammad Aljammal	30ddea6419	hot fixing	4 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	4 years ago
Mohammad Aljammal	ed729689a9	Merge branch 'design_issues' into 'development' ... fix design issues See merge request Cloud_Solution/diplomatic-quarter!237	4 years ago
Mohammad Aljammal	634c874eee	fix design issues	4 years ago
mosazaid	2843b1393e	some design enhancments	4 years ago
Mohammad Aljammal	de1b7cc1d0	fix merge issues	4 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	4 years ago
Mohammad Aljammal	952e106531	return privilege	4 years ago
Mohammad Aljammal	f77d2b497e	fix issues	4 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	4 years ago
enadhilal	10734d5994	connecting pages. ... trnaslate. calling API. review page. product details page. Wishlist page. Brands page.	4 years ago
Mohammad Aljammal	6bda03e935	hot fixing	4 years ago
Mohammad Aljammal	5e3f6363cf	fix issues	4 years ago
Sultan Khan	8becd4f920	login issue fixed	4 years ago
Sultan Khan	73c8e00852	bug fixes	4 years ago
Sultan Khan	18f492e52f	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	d53031b0e6	blood type update for family files	4 years ago
Mohammad Aljammal	2059b76fc1	fix Medical profile	4 years ago
Mohammad Aljammal	4d8f42b517	fix issues vital sign issue	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
Zohaib Kambrani	508bc191be	geofencing login check fix	4 years ago
Sultan Khan	a0baaac314	bug fixes	4 years ago
Zohaib Kambrani	d8bd7d145d	no message	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	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	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
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
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
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	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
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	8457972fda	no message	4 years ago
haroon amjad	951d9b553f	fixes & updates	4 years ago
Zohaib Kambrani	92ba977fca	no message	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
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	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
Sultan Khan	e28209d4e8	bug 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
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
haroon amjad	33956db22a	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # lib/config/config.dart	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
Sultan Khan	7f44677242	voice command priv	4 years ago
Mohammad Aljammal	935e72975c	add new privilege	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
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
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
Mohammad Aljammal	77dcb918c3	Revert "Merge branch 'pharmacy-hussam' into 'master'" ... This reverts merge request !149	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	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
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
Mohammad Aljammal	dc898a799d	Add Privileges	4 years ago
haroon amjad	ff0d66ccdb	Covid test translations	4 years ago
Zohaib Kambrani	1155466d19	Packages and Offer Slider at home	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
Zohaib Kambrani	27182ee8db	no message	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	603833db37	login changes	4 years ago
haroon amjad	e5feef8a9d	Updates & UI Fixes	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
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
Mohammad Aljammal	2731c5b1d4	Merge branch 'sultan' into 'diplomatic-quarter-live' ... Sultan See merge request Cloud_Solution/diplomatic-quarter!127	4 years ago
Sultan Khan	7c33c06c0c	fingerprint	4 years ago
Mohammad Aljammal	0ac599ea1c	fix vital Sign	4 years ago
haroon amjad	21c7c94ef2	updates & fixes	4 years ago
Sultan Khan	8d499704dc	family file changes	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
Sultan Khan	2f454055b9	login fixed	4 years ago
Sultan Khan	6e152951b4	notification count	4 years ago
Sultan Khan	00b0154987	my family	4 years ago
Sultan Khan	fdef34a394	viral sign issue	4 years ago
Zohaib Kambrani	69d1e4bb0b	no message	4 years ago
Sultan Khan	1eb6516ea6	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Mohammad Aljmma	741126102d	fix issue #11	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
Sultan Khan	283473a06a	theme changes	4 years ago
Zohaib Kambrani	0c71fbad5f	no message	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
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
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	570aa514cd	fix user authentication data	4 years ago
haroon amjad	ee67852970	Bottom navbar count & ToDo list fixed	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
Sultan Khan	b9b5797cbc	login issue fixed	4 years ago
haroon amjad	89022231d7	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
hussam al-habibeh	6162833bba	offers products page	4 years ago
hussam al-habibeh	7815005e21	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam ... Conflicts: lib/config/config.dart lib/locator.dart lib/pages/landing/home_page.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
hussam al-habibeh	69a6bc2812	offers page	4 years ago
haroon amjad	4f53d058d4	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
mosazaid	11ff27bae3	Merge branch 'master' 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/pages/landing/landing_page.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart pubspec.yaml	4 years ago
mosazaid	9a169ff77b	finish home page and start working on order preview page	4 years ago
Mohammad Aljmma	e42f953bd1	fix prescription report issues	4 years ago
haroon amjad	ff3368eefb	Login check implemented for appointment & ToDo	4 years ago
hussam al-habibeh	e74e168e88	Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam ... Conflicts: android/app/build.gradle lib/config/config.dart lib/core/service/client/base_app_client.dart lib/locator.dart	4 years ago
hussam al-habibeh	f7cee8f484	pharmacy module app && category home page	4 years ago
mosazaid	d1ac4080ca	working on pharmacy home page	4 years ago
Mohammad Aljmma	59d592778b	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page	4 years ago
Mohammad Aljmma	e7e32a414b	fix barcode	4 years ago
haroon amjad	aeab57beab	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... # Conflicts: # lib/main.dart # lib/pages/landing/home_page.dart	4 years ago
haroon amjad	f5a2870fac	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon ... Implemented Badge count on ToDo list & my appointments	4 years ago
Mohammad Aljmma	d4be20b07b	add icons	4 years ago
Mohammad Aljmma	e10a0a4d54	add splash page fix language issues	4 years ago
umasoodch	23083fd5ad	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/config.dart # lib/widgets/others/app_scaffold_widget.dart	4 years ago
Mohammad Aljmma	856ab52439	fix ui issues	4 years ago
haroon amjad	6fd7a3fa3d	updates	4 years ago
Mohammad Aljmma	89cfcd3cad	fix design issues	4 years ago
Mohammad Aljmma	874de15040	change the home page design	4 years ago
Mohammad Aljammal	50dffe9af9	Merge branch 'Haroon' into 'master' ... Haroon See merge request Cloud_Solution/diplomatic-quarter!74	4 years ago
Mohammad Aljmma	d0ed776ff6	new home health service	4 years ago
haroon amjad	dfa7e0e02f	updates & fixes	4 years ago
Fatimah Alshammari	1e00b9a4d8	added my-profile	4 years ago
jammal	7dc55f3378	Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/locator.dart lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart lib/uitl/translations_delegate_base.dart	4 years ago
enadhilal	5445cced89	Merge branch 'master' into enad_pharmacy2 ... # Conflicts: # lib/config/config.dart # lib/widgets/others/app_scaffold_widget.dart	4 years ago
jammal	57f938aa09	fix ios issues	4 years ago
jammal	0fceca8f3e	fix ios issues	4 years ago
enadhilal	068382e76f	add call for backend service	4 years ago
Mohammad Aljammal	29f0402cbd	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan ... Conflicts: lib/config/config.dart lib/config/shared_pref_kay.dart lib/core/service/client/base_app_client.dart lib/pages/AlHabibMedicalService/​ health_calculators.dart lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart lib/pages/MyAppointments/widgets/AppointmentCardView.dart lib/pages/login/confirm-login.dart lib/pages/login/login.dart lib/services/appointment_services/GetDoctorsList.dart lib/uitl/translations_delegate_base.dart lib/widgets/drawer/app_drawer_widget.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
Mohammad Aljammal	d3d0fa00e7	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers ... Conflicts: lib/pages/landing/home_page.dart	4 years ago
Mohammad Aljammal	53bbafdc2b	fix Authenticated User Object	4 years ago
Sultan Khan	3ad928902b	voice command	4 years ago
haroon amjad	41d50e23e3	covid drivethru implemented	4 years ago
Mohammad Aljammal	84bb68789d	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s ... Conflicts: lib/config/config.dart lib/pages/BookAppointment/widgets/DoctorView.dart lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart lib/pages/ContactUs/findus/hospitrals_page.dart lib/pages/ContactUs/findus/pharmacies_page.dart	4 years ago
Mohammad Aljammal	06416b4934	add Not authenticated Page	4 years ago
Elham Rababah	31b217aa19	First step from CMC	4 years ago
Sultan Khan	227731f8f8	Merge	4 years ago
Elham Rababah	293c557b54	First step from Home health care service	4 years ago
Sultan Khan	ea86e88e2e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	5c859034d6	voice search	4 years ago
Mohammad Aljammal	f543126152	Ambulance Service	4 years ago
haroon amjad	929e289a6f	started implementing Covid-19 DriveThru Test Module	4 years ago
haroon amjad	7fdc0da9dc	livecare scheduling implemented	4 years ago
Mohammad Aljammal	3946f0355c	Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers ... Conflicts: lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/locator.dart lib/pages/landing/landing_page.dart	4 years ago
Sultan Khan	03ff56f2de	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	591e9e9a4c	updated	4 years ago
Mohammad Aljammal	82226e62e1	Merge branch 'insurance' into 'master' ... HMG Service layout See merge request Cloud_Solution/diplomatic-quarter!52	4 years ago
Mohammad Aljammal	2952fd56ab	Done Active Medications Service	4 years ago
hussam al-habibeh	3c5adc0a1d	HMG Service layout	4 years ago
Amjad amireh	c2cfea7360	Contact us	4 years ago
Amjad amireh	c2b7507005	Contact us	4 years ago
haroon amjad	478917b240	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
Mohammad Aljammal	4ac77593ad	add payment service page and translations	4 years ago
haroon amjad	38c980be81	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
haroon amjad	5400d534db	updates for push notifications	4 years ago
Sultan Khan	0a2cb22042	design issues fixed	4 years ago
Mohammad Aljammal	8e96c79d05	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh ... Conflicts: lib/config/localized_values.dart	4 years ago
Mohammad Aljammal	9159928e27	edit on vaccine service	4 years ago
Mohammad Aljammal	b0f0b87345	fix merge issues	4 years ago