Commit Graph

80 Commits (3ee0acbf6e932e4568a46a75d12c880d7546613c)

Author SHA1 Message Date
mosazaid e1c4721ac1 Merge branch 'development' into video_stream_fix_bugs
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Mohammad Aljammal 7614b4aa5c fix the video call issues 5 years ago
Elham Rababah 3cf4ef4348 check if special in home page 5 years ago
Elham Rababah 363b55069f first step form Special Clinic 5 years ago
Elham Rababah c46c339933 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah 1edd375fd7 first step from special clinic 5 years ago
Elham Rababah 176c0ab97c first step from live care fixes 5 years ago
Elham Rababah 792c85e28a fix live care icon size 5 years ago
mosazaid 0afe3b3afd livecare changes 5 years ago
mosazaid 5d0a7a4045 livecare changes 5 years ago
Mohammad Aljammal 725c87fe8b Add favorite procedure templates for lab and radiology 5 years ago
Elham Rababah 1bc01e0ad1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor 5 years ago
Elham Rababah 97a855ab70 return condition in home page 5 years ago
Elham Rababah 5778a4a887 view list of Live care patient 5 years ago
mosazaid 186461f3a8 hot fix 5 years ago
mosazaid 67e0cac742 add livecare to home 5 years ago
Mohammad Aljammal 16dac03b24 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
 Conflicts:
	lib/locator.dart
	lib/screens/home/home_screen.dart
5 years ago
Mohammad Aljammal f6539c82a6 add live care card in home page 5 years ago
mosazaid 9e552668c7 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 2fabe85b30 Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 1cc55d809c fix authentication service 5 years ago
Elham Rababah 164a7fd2fc fix merge issues 5 years ago
Elham Rababah 56698a82fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
 Conflicts:
	lib/core/service/home/auth_service.dart
	lib/core/viewModel/auth_view_model.dart
	lib/core/viewModel/imei_view_model.dart
	lib/locator.dart
	lib/screens/auth/login_screen.dart
	lib/screens/home/home_screen.dart
	lib/screens/patients/patient_search/patient_search_screen.dart
	lib/widgets/auth/verification_methods.dart
5 years ago
Elham Rababah 0adcfeccce fix auth bug 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
Elham Rababah 2e71706cab add UNVERIFIED status 5 years ago
mosazaid 12bb283a68 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
5 years ago
mosazaid 72ee88d567 working on dashboard 5 years ago
Mohammad Aljammal 8e4321b3da Migration dev to Zohaib branch 5 years ago
Mohammad Aljammal b3ae86db31 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
	lib/screens/patients/ReferralDischargedPatientDetails.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/patients_screen.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/prescription/update_prescription_form.dart
	lib/screens/sick-leave/add-sickleave.dart
	lib/widgets/patients/PatientCard.dart
	pubspec.lock
5 years ago
mosazaid 2023ce9b55 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/core/viewModel/dashboard_view_model.dart
#	lib/screens/home/home_screen.dart
5 years ago
hussam al-habibeh bc340693ba project refactoring 5 years ago
hussam al-habibeh 9457e04825 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/sick-leave/add-sickleave.dart
5 years ago
Elham Rababah 7af300d455 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Mohammad Aljammal f0039b491e fix home page 5 years ago
mosazaid 4f817810c2 hot fix 5 years ago
Elham Rababah 53791f1028 change imei to authentication 5 years ago
Elham Rababah a5120b473f rename Auth view model to Doctor Profile View Model 5 years ago
mosazaid 4ce9a3c5bf finish home-refactoring 5 years ago
Mohammad Aljammal 16519d0ccf hot fix 5 years ago
Elham Rababah 15bead5164 add insert IMEI service 5 years ago
mosazaid 0d86759245 working on dashboard re-factoring 5 years ago
mosazaid 916c1266ca refactoring home screen 5 years ago
Elham Rababah c72ef3f585 finish refactoring login 5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
Elham Rababah 34c58149a0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Elham Rababah 1a1757f841 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter 5 years ago
Elham Rababah 663d2a942f first step from refactoring auth part 5 years ago
mosazaid 802bd83ddd design-changes 5 years ago
Elham Rababah 607da6af66 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
5 years ago