Commit Graph

803 Commits (c6156921e80777b15deff5a26b7b258a87bb5884)

Author SHA1 Message Date
Elham Rababah c6156921e8 fix DA-197 4 years ago
Elham Rababah e95638bd99 fix DA-157 4 years ago
Elham Rababah e9de8a72e9 fix DA-152 4 years ago
Elham Rababah 855ed0ac12 fix 145 4 years ago
Elham Rababah 02167afa6b fix 143,144 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 763d6bb49f finish add loader 4 years ago
hussam al-habibeh 5150f9b93d Prescription & procedure body update 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
Mohammad Aljammal 9147cde86e Merge branch 'tasks-translation' into 'development'
medical dile & Order Procedure translation

See merge request Cloud_Solution/doctor_app_flutter!256
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 eae0bb443f solve problem with vital signs charts depend on date 4 years ago
mosazaid d9d4e22531 Merge branch 'development' into feature-ucaf 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
hussam alhababieh d87aeb290f Merge branch 'development' into 'procedure-fix'
# Conflicts:
#   lib/landing_page.dart
4 years ago
hussam al-habibeh b0410dc744 Procedure updates 4 years ago
hussam al-habibeh debcad3a3d prescription 4 years ago
hussam al-habibeh 4b54ca7d47 prescription 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
Mohammad Aljammal 307463865b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!249
4 years ago
Mohammad Aljammal 3306d6f400 Merge branch 'medical-file' into 'development'
post Procedure

See merge request Cloud_Solution/doctor_app_flutter!248
4 years ago
hussam al-habibeh dd53a9bd4d post Procedure 4 years ago
mosazaid 306d484837 Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 8726653ffb working on Referral feature 4 years ago
Mohammad Aljammal cc14448d48 Merge branch 'soap_update' into 'development'
fix loader in login

See merge request Cloud_Solution/doctor_app_flutter!247
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
mosazaid 2f17167e2f some design enhancments 4 years ago
mosazaid db502b7f0d Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 421cee49c7 Merge branch 'feature-ucaf' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 97d05c72c2 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
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
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 70cfc4668b Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!243
4 years ago
Elham Rababah 3c1b51eb94 fix issue related to landing page 4 years ago
Elham Rababah 90a16676db fix issue related to SOAP 4 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
4 years ago