Commit Graph

1544 Commits (e1eaab6a8e045bf08dc892bf5c08b06b104eeb03)

Author SHA1 Message Date
Elham Rababah e1eaab6a8e fix medical profile_medical_info 5 years ago
Elham Rababah f4ce9eb004 Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology 5 years ago
Elham Rababah 67abe2a5e7 first step from radiology 5 years ago
Mohammad Aljammal a95bb8be04 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!529
5 years ago
Sultan Khan 5afb44adfd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 0260b92f24 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!528
5 years ago
Sultan Khan 3aabb1537c in patient 5 years ago
hussam al-habibeh 240f70d163 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/procedures/ProcedureCard.dart
5 years ago
hussam al-habibeh 5bd50caa22 hot fixes 5 years ago
Elham Rababah bd01624f5a create New order widget 5 years ago
Elham Rababah 0c74bc4c60 Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor 5 years ago
Elham Rababah dcd1605649 add error Msg 5 years ago
mosazaid 4b3c5b9f37 Merge branch 'development' into app-changes 5 years ago
mosazaid dde8d9aa48 design hot fixes 5 years ago
hussam al-habibeh 6c3d681387 hot fixes 5 years ago
Mohammad Aljammal 762fe14c37 Merge branch 'app-changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!525
5 years ago
mosazaid 51234b8059 hot fix 5 years ago
mosazaid 21ef5ee56a hot fix 5 years ago
Mohammad Aljammal 175168d56a Merge branch 'app-changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!524
5 years ago
mosazaid 6c3cb8cc94 hot fix 5 years ago
mosazaid 54482bfb1d hot fix 5 years ago
Sultan Khan 6f52c9a7fd fixe 5 years ago
Elham Rababah f8c6f13a11 small fix after merge 5 years ago
mosazaid 74b0bac517 remove chart from procedure 5 years ago
Sultan Khan cacb619f02 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
hussam al-habibeh 89451a3c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/medical-file/medical_file_page.dart
	lib/screens/patients/profile/refer_patient_screen.dart
5 years ago
Sultan Khan 4a8ae97518 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 0ea66c4483 bug fixes 5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid 8ae0a91c05 working on text widget 5 years ago
hussam al-habibeh 17c878fa4c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/patients/profile/lab_result/lab_orders_screen.dart
	lib/screens/patients/profile/refer_patient_screen.dart
5 years ago
hussam al-habibeh 679ebe8fa6 Refacatoring Medical file 5 years ago
mosazaid bbe94d2b9b Merge branch 'development' into design-fixes
# Conflicts:
#	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
#	lib/screens/patients/profile/refer_patient_screen.dart
#	lib/screens/patients/profile/referral/refer-patient-screen.dart
#	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
#	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
#	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
#	lib/screens/prescription/add_prescription_form.dart
#	lib/screens/prescription/prescription_warnings.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
5 years ago
mosazaid 10baff8d59 button fixes 5 years ago
Elham Rababah b59bd0bd43 small fix in prescription_items_page 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
hussam al-habibeh ebe05226e9 Delteing unused file & refactoring routes page 5 years ago
Elham Rababah 2a7daadead fix after merge 5 years ago
Elham Rababah 7579a21b83 Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
 Conflicts:
	lib/widgets/auth/login_form.dart
5 years ago
Elham Rababah 8220ef7700 add auto complete search 5 years ago
mosazaid af9bd53feb Merge branch 'development' into design-fixes
# Conflicts:
#	lib/widgets/auth/login_form.dart
5 years ago
mosazaid b8f6c35e75 working on buttons widgets 5 years ago
Mohammad Aljammal 5560955bd7 Merge branch 'patient_app_services' into 'development'
fix pharmacies list

See merge request Cloud_Solution/doctor_app_flutter!519
5 years ago
Mohammad Aljammal ad0f159c98 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!516
5 years ago
Mohammad Aljammal 0e459de1a3 fix pharmacies list 5 years ago
mosazaid 9f61c7eaa0 Merge branch 'design-fixes' into development 5 years ago
mosazaid 65585ab586 add charts to procedures 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
Elham Rababah 59ec9d8e56 first step from change text fields 5 years ago
Sultan Khan f6e0e1b0cd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago