112 Commits (18dad434a01304833ee1e81b4f82ceadc37fc071)

Author	SHA1	Message	Date
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
Sultan Khan	a0baaac314	bug fixes	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
Sultan Khan	eec67ac930	big fixes	4 years ago
Sultan Khan	8a554aa2f8	auth services fixed	4 years ago
Sultan Khan	b759758a68	bug fixes	4 years ago
haroon amjad	9d046fd971	updates & fixes	4 years ago
Sultan Khan	21ccf1ef86	bug fixes	4 years ago
Sultan Khan	f5b7d35f23	bug fixes	4 years ago
haroon amjad	7edb0c8009	Doctor rating dialog revamped	4 years ago
Zohaib Kambrani	27182ee8db	no message	4 years ago
Sultan Khan	603833db37	login changes	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	8d499704dc	family file changes	4 years ago
Sultan Khan	2f454055b9	login fixed	4 years ago
Sultan Khan	6e152951b4	notification count	4 years ago
Sultan Khan	d2f391ab7f	setting page inprogress	4 years ago
Sultan Khan	4c8c4e3725	setting page inprogress	4 years ago
Sultan Khan	91be66ecdd	family file changes	4 years ago
Sultan Khan	3589b21590	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
haroon amjad	b89c1f03b3	language translation fixes	4 years ago
Sultan Khan	f05b235cd0	login issue	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
Sultan Khan	aa8f9f18e1	forgot password	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	506e32e8c8	Payment issues resolved	4 years ago
haroon amjad	ee67852970	Bottom navbar count & ToDo list fixed	4 years ago
Mohammad Aljmma	9880b0236b	fix my family issues	4 years ago
Sultan Khan	b9b5797cbc	login issue fixed	4 years ago
Mohammad Aljmma	a796e0392b	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_login ... Conflicts: lib/pages/login/confirm-login.dart lib/pages/login/login.dart	4 years ago
Mohammad Aljmma	f79d8eb8f9	fix login issues	4 years ago
haroon amjad	dbb53e7821	fixed forgot password issue, Implemented new loader in login flow	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
Sultan Khan	deb828b4dd	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	23b48485ed	voice command	4 years ago
haroon amjad	dfa7e0e02f	updates & fixes	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
Sultan Khan	8f18d1025a	voice search	4 years ago
haroon amjad	929e289a6f	started implementing Covid-19 DriveThru Test Module	4 years ago