Commit Graph

19 Commits (671c432cd711cc6b084dfc83af5fc786f7ca2d22)

Author SHA1 Message Date
Sikander Saleem f6ae7ed770 merge changes-4 3 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 b759758a68 bug fixes 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
Sultan Khan 603833db37 login changes 4 years ago
Sultan Khan 8d499704dc family file changes 4 years ago
Sultan Khan 91be66ecdd family file changes 4 years ago
Sultan Khan f05b235cd0 login issue 4 years ago
Mohammad Aljmma 981020fce5 fix my family issues 4 years ago
Mohammad Aljmma 9880b0236b fix my family issues 4 years ago
Mohammad Aljmma f79d8eb8f9 fix login issues 4 years ago
Sultan Khan 0a2cb22042 design issues fixed 4 years ago
Sultan Khan 0f63b922d1 speech to text 4 years ago
Sultan Khan f6a3f0e615 family file 4 years ago
Sultan Khan 8887ba85fe family file 4 years ago
Sultan Khan 327c4585a6 family file change 4 years ago
Sultan Khan 4c1a8dc38f new changes 4 years ago
Sultan Khan 621870eca1 family file changes 4 years ago