1601 Commits (2a16264d835c7fe00a37c90f34e465df7fe41f54)

Author SHA1 Message Date
mosazaid 596f518525 Merge branch 'development' into release-hot-fix
# Conflicts:
#	lib/screens/patients/profile/patient_profile_screen.dart
#	lib/widgets/patients/profile/PatientProfileButton.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
mosazaid bf9ce4694f fix logic 6 years ago
Elham Rababah b2a2884586 Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/screens/patients/profile/radiology/radiology_home_page.dart
6 years ago
hussam al-habibeh 1d09bcf251 hot fixes 6 years ago
Elham Rababah d4ddfa21e5 add the new logic 6 years ago
Mohammad Aljammal c924ea667f hot fixes 6 years ago
Sultan Khan c5f12ca307 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan e83032e725 patient card 6 years ago
Mohammad Aljammal 6007421629 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!547
6 years ago
Mohammad Aljammal 0ded3a5a03 hot fixes 6 years ago
Mohammad Aljammal 349c63f4ce Merge branch 'in-patient-changes' into 'development'
hoh design fixes

See merge request Cloud_Solution/doctor_app_flutter!543
6 years ago
Mohammad Aljammal 1711f6482d Merge branch 'in_patient_services' into 'development'
small update in procedure

See merge request Cloud_Solution/doctor_app_flutter!544
6 years ago
Mohammad Aljammal 9e8aef0835 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 6 years ago
Mohammad Aljammal 8350d68397 Merge branch 'progress_note' into 'development'
add condition

See merge request Cloud_Solution/doctor_app_flutter!545
6 years ago
Mohammad Aljammal 414ccdde49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 6 years ago
Mohammad Aljammal b37c607813 done the referral service 6 years ago
Sultan Khan 426aa03aa5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan b5503a8411 fixes 6 years ago
mosazaid 09f87a6cbd Merge branch 'development' into in-patient-changes
# Conflicts:
#	lib/screens/patients/profile/lab_result/LabResultWidget.dart
6 years ago
Elham Rababah 79037d8fc7 add condition 6 years ago
hussam al-habibeh c7275a3106 small update in procedure 6 years ago
mosazaid d78a3e168e hoh design fixes 6 years ago
Mohammad Aljammal 650a949c6a Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!542
6 years ago
Elham Rababah 9d780f72b4 remove commented code 6 years ago
Mohammad Aljammal 36189adf94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card.dart
6 years ago
Mohammad Aljammal ae8882fbae Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!539
6 years ago
Elham Rababah 8d7fef3db9 fix some issue on progress_note_screen 6 years ago
hussam al-habibeh 0e65b743e3 Insurance Approval In Patient 6 years ago
mosazaid 78f2ab5ae3 design fixes 6 years ago
hussam al-habibeh e3102b3f5e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
6 years ago
hussam al-habibeh 94e598c5f2 Insurance Approval In Patient 6 years ago
mosazaid 2bf003c100 Merge branch 'development' into in-patient-changes 6 years ago
mosazaid 33545d1180 work on in paitent referral 6 years ago
Mohammad Aljammal fd790978c4 add new referral service 6 years ago
Sultan Khan 608198762d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan d0a39ca3d4 fixes 6 years ago
Elham Rababah acc3ecdbbe cancel progress_note part 6 years ago
Elham Rababah 4a263dda8a Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/config/config.dart
6 years ago
Elham Rababah 82285ccf39 show progress_note part 6 years ago
Mohammad Aljammal e4aae762cc Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!536
6 years ago
mosazaid 34e9a3797c Merge branch 'development' into in-patient-changes 6 years ago
Sultan Khan 822dc7da77 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan feef001323 bug fixes 6 years ago
Mohammad Aljammal bb8ad61b95 Merge branch 'in_patient_services' into 'development'
Prescriptions for in patient

See merge request Cloud_Solution/doctor_app_flutter!534
6 years ago
hussam al-habibeh 3e0f87527f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services 6 years ago
hussam al-habibeh 017074ba56 Prescriptions for in patient 6 years ago
Elham Rababah f2011301c6 update progress_note 6 years ago
mosazaid 9aecc6fbdb add lap results to inpatient and some changes on patient profile 6 years ago
Sultan Khan e445b5bb60 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan b52ba524a3 updated 6 years ago