Commit Graph

201 Commits (8f1b0bbe22e6531c6e2b596ce411d3cf87715656)

Author SHA1 Message Date
Elham Rababah 8615671095 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
 Conflicts:
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah f3220be735 fix DA-350 4 years ago
Sultan Khan 214dfecb3c DA-422 4 years ago
Sultan Khan 388c095d7f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan a309acbf46 dashboard changes 4 years ago
Elham Rababah 083b49aa0a fix DA-341 4 years ago
Sultan Khan fa80d62e7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 0dc25a4a03 bug fixes 4 years ago
Mohammad Aljammal 60e416e632 add done button in all pages user keyboard and hide the keyboard when the user click on background 4 years ago
mosazaid 1207339b01 Merge branch 'development' into admission-request 4 years ago
mosazaid 8d154239bb finish admission request feature 4 years ago
Elham Rababah a1c60e692f Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah 248367fbe9 fix DA-220 4 years ago
Elham Rababah 753ef3bfb0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Elham Rababah a5a7425a09 fix DA-149 4 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 4 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 4 years ago
Sultan Khan 8b7acf7202 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 6a23c2a137 bug fix 4 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
4 years ago
Elham Rababah 437ae3dfb5 Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah 34692b94c2 fix : DA-264 4 years ago
mosazaid de1d0283d2 some lables and translation changes and add search functionality for ListSelectDialog 4 years ago
mosazaid a64088320f DA-259 translation bug 4 years ago
mosazaid c2df291029 DA - 286 Fix 4 years ago
Mohammad Aljammal 6253e2c9a3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
 Conflicts:
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 75efcde0bc fix ios 4 years ago
mosazaid 2273808333 translation 4 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid ebc5ba7743 some fixes 4 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
4 years ago
Mohammad Aljammal 6d473be371 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!273
4 years ago
hussam al-habibeh 35bc8c03a4 bug fixing 4 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 4 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 4 years ago
Elham Rababah c065dbbdb3 Fixed DA:266 4 years ago
Elham Rababah 13c879654b DA-250: fix age 4 years ago
hussam al-habibeh fb8381ea61 bugs fix 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 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
Elham Rababah cc92fe56c6 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 c11f195e72 fix DA-192 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 9674eb89d9 add modification on so 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