Commit Graph

497 Commits (00543a759a4c1632fba91de0fac7a91347ef3caa)

Author SHA1 Message Date
Elham Rababah 00543a759a fix remarks in allergies 4 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 4 years ago
Elham Rababah 484c737836 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad Aljammal b89af8a5ab Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!266
4 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 735698ce90 bug fixes 4 years ago
Elham Rababah f0cd33ae43 fix issue on assessment design 4 years ago
Elham Rababah 1de25aae2f fix issue on assessment design 4 years ago
hussam al-habibeh d9fcf89c19 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/core/viewModel/medicine_view_model.dart
4 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 4 years ago
hussam al-habibeh 38d9881ed2 Prescription date 4 years ago
Elham Rababah 537f53c3de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 3be693337a some fixes 4 years ago
Elham Rababah 4e4e6a3600 fix DA-151 4 years ago
Elham Rababah a7ca7fb271 fix DA-151 4 years ago
hussam al-habibeh ced4edebde patinet profile update 4 years ago
Sultan Khan d55ce4c1ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
mosazaid cd95a581f0 simple changes 4 years ago
Elham Rababah cc92fe56c6 fix DA-154,DA-150 4 years ago
Sultan Khan 896078507f gub fixes 4 years ago
Elham Rababah e32c360f85 fix DA-154,DA-150 4 years ago
mosazaid e808d48035 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 88f1dc637f some fixes 4 years ago
Elham Rababah e95638bd99 fix DA-157 4 years ago
Elham Rababah 855ed0ac12 fix 145 4 years ago
Elham Rababah 4a3175830d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah eb90fc0161 fix bug in assessment 4 years ago
Sultan Khan 40cfad7f7b login 4 years ago
Elham Rababah 9674eb89d9 add modification on so 4 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan a99b3847ac login completed 4 years ago
Elham Rababah bc8a90ef2c first step from fix loader 4 years ago
Mohammad Aljammal f75ab83981 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
hussam al-habibeh 1fa52e0394 medical dile & Order Procedure translation 4 years ago
hussam al-habibeh 015c3b53c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
hussam al-habibeh e67233bb21 medical dile & Order Procedure translation 4 years ago
mosazaid dcb71e5c22 Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf

# Conflicts:
#	lib/util/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Elham Rababah 23fb2e7297 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 4 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 4 years ago
Sultan Khan 722e1a5c41 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan ad99cebf02 login and drug to drug 4 years ago
mosazaid 306d484837 Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 8726653ffb working on Referral feature 4 years ago
Elham Rababah 1f2aebde33 fix loader in login 4 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 40e9ab864a login changes 4 years ago
Mohammad Aljammal 748802af1d Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!245
4 years ago
Elham Rababah 90a16676db fix issue related to SOAP 4 years ago