Commit Graph

1930 Commits (html_rich_text)

Author SHA1 Message Date
Elham Rababah e934d3b003 first step from upgrade 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 14a3ca8695 fix login screen design 5 years ago
Elham Rababah 515955663a add verification 5 years ago
Mohammad Aljammal 1187c3b605 fix authentication provider 5 years ago
Elham Rababah 6933b6577f add session time out. 5 years ago
Elham Rababah a9bd02a908 first step from user another account 5 years ago
Elham Rababah 0d8684481d fix sms error and some design issue 5 years ago
Mohammad Aljammal 8ac040a809 hot fix 5 years ago
Mohammad Aljammal 42275b41fd Merge branch 'load_medical_report' into 'development'
Load medical report

See merge request Cloud_Solution/doctor_app_flutter!665
5 years ago
Mohammad Aljammal 2c43cfcdde Merge branch 'home-refactoring' into 'development'
Home refactoring

See merge request Cloud_Solution/doctor_app_flutter!648
5 years ago
Elham Rababah e0be4ec1be move logout function from helper to authentication view model 5 years ago
Elham Rababah c9e7fb9883 small fix 5 years ago
Elham Rababah 1eeaaa48ca remove comment 5 years ago
Elham Rababah 0adcfeccce fix auth bug 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
Mohammad Aljammal 8399677a0a Fix Dubai user issues 5 years ago
Elham Rababah 2e71706cab add UNVERIFIED status 5 years ago
mosazaid 0e2b700136 vital sign hot fix 5 years ago
mosazaid 25fb8ea5ae hot fix 5 years ago
Elham Rababah fd9f93a936 do some refactor and change the code to view model 5 years ago
mosazaid 70480cc09e Merge branch 'development' into home-refactoring 5 years ago
mosazaid 50b4b8eb50 dashboard change 5 years ago
Mohammad Aljammal 8541ddc0f8 fix LabOrderResult 5 years ago
mosazaid 6280904669 Merge branch 'development' into home-refactoring 5 years ago
mosazaid 27f940b473 home design 5 years ago
Mohammad Aljammal 5c73f3b3b6 Merge branch 'prescription_changes' into 'development'
prescreption hot fix

See merge request Cloud_Solution/doctor_app_flutter!659
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
hussam al-habibeh bf589e703e prescreption hot fix 5 years ago
Mohammad Aljammal 8653d54a0d Merge branch 'zohaib_and_dev' into 'development'
showDailog Migration

See merge request Cloud_Solution/doctor_app_flutter!658
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 0bfa74f1c9 ucaf-change 5 years ago
Elham Rababah 7dbd4c9cc6 Merge branch 'auth_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
 Conflicts:
	lib/screens/auth/login_screen.dart
5 years ago
Elham Rababah 301972f9b7 small fixes 5 years ago
Mohammad Aljammal 081bfe3f61 add TODO to Elham 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 292bc2a97f prescription changes 5 years ago
mosazaid 95a6893b59 home design 5 years ago
hussam al-habibeh c50a483663 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/core/service/patient_medical_file/prescription/prescription_service.dart
	lib/core/viewModel/prescription_view_model.dart
	lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh cecc1a725d pescription changes 5 years ago
Mohammad Aljammal b871009033 Merge branch 'feature-modeical_profile' into 'development'
Feature modeical profile

See merge request Cloud_Solution/doctor_app_flutter!654
5 years ago
Mohammad Aljammal 74ded739c8 fix imports 5 years ago
Elham Rababah 745545ffc3 add models 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 333d1e3f50 first step from models 5 years ago
mosazaid b10fe8112a Merge branch 'development' into home-refactoring 5 years ago