Commit Graph

127 Commits (75efcde0bca3f5c63674678e72338ef0bf93224c)

Author SHA1 Message Date
Mohammad Aljammal 75efcde0bc fix ios 5 years ago
Elham Rababah 7db8a42adc Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 5 years ago
Elham Rababah c065dbbdb3 Fixed DA:266 5 years ago
Elham Rababah 913ffc3052 Fix DA-260,DA-267 5 years ago
Elham Rababah 68d27a451d fix general issue 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Elham Rababah 484c737836 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 735698ce90 bug fixes 5 years ago
Elham Rababah f0cd33ae43 fix issue on assessment design 5 years ago
Elham Rababah 1de25aae2f fix issue on assessment design 5 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
5 years ago
Elham Rababah cc92fe56c6 fix DA-154,DA-150 5 years ago
mosazaid e808d48035 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 88f1dc637f some fixes 5 years ago
Elham Rababah c11f195e72 fix DA-192 5 years ago
Elham Rababah 855ed0ac12 fix 145 5 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
5 years ago
Elham Rababah 9674eb89d9 add modification on so 5 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
5 years ago
hussam al-habibeh 1fa52e0394 medical dile & Order Procedure translation 5 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
5 years ago
hussam al-habibeh e67233bb21 medical dile & Order Procedure translation 5 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
5 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
5 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 5 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 5 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 40e9ab864a login changes 5 years ago
mosazaid 97d05c72c2 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 0147e7e49b do translation, fix some bugs 5 years ago
Elham Rababah 4f1a892be4 first step form create episode 5 years ago
mosazaid ca9f1a022b Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 5 years ago
Elham Rababah a46a61c5cf fix get and post issue to make it works with vida 5 years ago
Elham Rababah 7ce1d2dd55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Sultan Khan 87d90a394b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 044ad7b51a offtime leave 5 years ago
mosazaid e75e7801aa working on UCAF get data 5 years ago
Elham Rababah ffe7e7c57f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah c3bb408787 add some translations 5 years ago
mosazaid 7983f998bd Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Sultan Khan ad967e8aae Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 5 years ago
Sultan Khan 68cfbf8fc7 doctor leave 5 years ago
mosazaid ee9ca72057 change empty referral message 5 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago