Commit Graph

1877 Commits (3aabb1537c1e90301f3895a719e1e394066b43f2)
 

Author SHA1 Message Date
Sultan Khan 3aabb1537c in patient 5 years ago
Sultan Khan 6f52c9a7fd fixe 5 years ago
Sultan Khan cacb619f02 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal b49df64d4c Merge branch 'code_reafactoring' into 'development'
Code reafactoring

See merge request Cloud_Solution/doctor_app_flutter!522
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
Mohammad Aljammal 1fd7a2a394 Merge branch 'design-fixes' into 'development'
working on buttons widgets

See merge request Cloud_Solution/doctor_app_flutter!520
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
Mohammad Aljammal a11fd770b0 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!521
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
Mohammad Aljammal a0b0518815 Merge branch 'design-fixes' into 'development'
add procedure charts

See merge request Cloud_Solution/doctor_app_flutter!518
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
Sultan Khan fda75c721d bug fixes 5 years ago
Mohammad Aljammal fac8473f59 Merge branch 'design-fixes' into 'development'
lap result re-design

See merge request Cloud_Solution/doctor_app_flutter!515
5 years ago
Mohammad Aljammal 43c254de05 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!513
5 years ago
Mohammad Aljammal 1044f1d4e3 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!514
5 years ago
mosazaid d543ce0f6f lap result re-design 5 years ago
Sultan Khan 878727fa7f dashboard change 5 years ago
Sultan Khan 4ed8f716db dashboard changes 5 years ago
Elham Rababah 2fd30ae1be improve exam step 5 years ago
Elham Rababah 042d4b4bfd remove commented code 5 years ago
Elham Rababah 4da72c81af first step form code refactor 5 years ago
Mohammad Aljammal 5667f03168 Merge branch 'home_refactor' into 'development'
fix home

See merge request Cloud_Solution/doctor_app_flutter!512
5 years ago
Elham Rababah 76d411b79a move soap folder to the correct place 5 years ago
Elham Rababah 83ab0cff64 fix home 5 years ago
Mohammad Aljammal c9c736c80c Merge branch 'patient_app_services' into 'development'
hot fixes

See merge request Cloud_Solution/doctor_app_flutter!511
5 years ago
Mohammad Aljammal 2d7b2003bd hot fixes 5 years ago
Mohammad Aljammal 4139337297 Merge branch 'patient_app_services' into 'development'
Add update page

See merge request Cloud_Solution/doctor_app_flutter!510
5 years ago
Mohammad Aljammal 90fdeb7893 add update page 5 years ago
Mohammad Aljammal f55bb4e60e add update page 5 years ago