Commit Graph

946 Commits (62d45d4e1c3a77e70e2c9d0c40155dbee2134cd0)

Author SHA1 Message Date
hussam al-habibeh 23c826b37f bug fix 5 years ago
Elham Rababah cfb9ea30cb fix : DA-335 5 years ago
Mohammad Aljammal 8f9e799070 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!287
5 years ago
Elham Rababah 2b07d16f00 fix : DA-303 5 years ago
Elham Rababah f84902b73b fix : DA-333 5 years ago
Elham Rababah e652752729 fix : DA-334 5 years ago
Mohammad Aljammal 8916b4a1f3 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!286
5 years ago
mosazaid e74de0b475 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid b63c7aff25 Fix DA-331 vital signs uncorrect temperature value 5 years ago
hussam al-habibeh 29de472c66 bug fix 5 years ago
hussam al-habibeh 9b5899d4e6 bug fix 5 years ago
hussam al-habibeh deca96f62e bug fix 5 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
5 years ago
Elham Rababah 494479f1d9 fix : DA-264 fix merge error 5 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
5 years ago
Elham Rababah febdadc924 fix : DA-264 5 years ago
Elham Rababah 34692b94c2 fix : DA-264 5 years ago
mosazaid de1d0283d2 some lables and translation changes and add search functionality for ListSelectDialog 5 years ago
hussam al-habibeh b267342c03 fixing issues 5 years ago
mosazaid a64088320f DA-259 translation bug 5 years ago
Elham Rababah b9b5ec09e4 fix : DA-248 5 years ago
mosazaid c2df291029 DA - 286 Fix 5 years ago
Mohammad Aljammal cb767e4d4c Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!282
5 years ago
hussam al-habibeh 6b0e87ce55 bugs fix 5 years ago
Mohammad Aljammal abcd7e9833 Merge branch 'fix_issues' into 'development'
remark fix in allergies

See merge request Cloud_Solution/doctor_app_flutter!280
5 years ago
Elham Rababah 6820e2d097 remark fix in allergies 5 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
5 years ago
Mohammad Aljammal 75efcde0bc fix ios 5 years ago
Mohammad Aljammal fa94b60711 Merge branch 'feature-ucaf' into 'development'
translation

See merge request Cloud_Solution/doctor_app_flutter!278
5 years ago
Mohammad Aljammal 3cfb88b313 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!277
5 years ago
mosazaid 2273808333 translation 5 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Sultan Khan ed3b42d721 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan d34744e168 bug fix 5 years ago
mosazaid ebc5ba7743 some fixes 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
Mohammad Aljammal 6d473be371 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!273
5 years ago
hussam al-habibeh 35bc8c03a4 bug fixing 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 fd17fc4608 enforce user to add date in case referral 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 905818b532 add admission no to orders 5 years ago
Elham Rababah b9eaee1887 fix design 5 years ago
Elham Rababah 13c879654b DA-250: fix age 5 years ago
Mohammad Aljammal 81fdcb2d8d Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!271
5 years ago
Mohammad Aljammal fbd509d6ec Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!272
5 years ago
hussam al-habibeh fb8381ea61 bugs fix 5 years ago
Elham Rababah 68d27a451d fix general issue 5 years ago
Sultan Khan b92bc85e8f bug fixes 5 years ago
Elham Rababah a5bccddf55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Sultan Khan d5d7ea6c49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 63e8ee8dd0 sick leave 5 years ago
hussam alhababieh 3c55af7adc Merge branch 'development' into 'tasks-translation'
# Conflicts:
#   lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh 7c800bdab4 medical file fix 5 years ago
Elham Rababah 00543a759a fix remarks in allergies 5 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 5 years ago
Elham Rababah cbf850da2f fix DA-201 5 years ago
Elham Rababah 484c737836 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Mohammad Aljammal b89af8a5ab Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!266
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
hussam al-habibeh bada160cf5 Search Medacation 5 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
5 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 5 years ago
hussam al-habibeh 38d9881ed2 Prescription date 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 ba263ada44 fix DA-201 5 years ago
mosazaid 5440fd1ef9 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 3be693337a some fixes 5 years ago
Elham Rababah 4e4e6a3600 fix DA-151 5 years ago
Elham Rababah a7ca7fb271 fix DA-151 5 years ago
hussam al-habibeh ced4edebde patinet profile update 5 years ago
Elham Rababah 03fa9de901 fix DA-198 5 years ago
Elham Rababah 53e88620ec fix DA-230 5 years ago
Sultan Khan d55ce4c1ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 5af6210785 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!263
5 years ago
Mohammad Aljammal 574e1525d9 Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix

See merge request Cloud_Solution/doctor_app_flutter!262
5 years ago
mosazaid cd95a581f0 simple changes 5 years ago
Elham Rababah cc92fe56c6 fix DA-154,DA-150 5 years ago
Sultan Khan 896078507f gub fixes 5 years ago
hussam al-habibeh e133a014e8 Prescription & medical file fix 5 years ago
Elham Rababah e32c360f85 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 8360179050 fix DA-195 5 years ago
Elham Rababah c11f195e72 fix DA-192 5 years ago
Elham Rababah d53493aa52 fix DA-237 5 years ago
Elham Rababah c6156921e8 fix DA-197 5 years ago
Elham Rababah e95638bd99 fix DA-157 5 years ago
Elham Rababah e9de8a72e9 fix DA-152 5 years ago
Elham Rababah 855ed0ac12 fix 145 5 years ago
Elham Rababah 02167afa6b fix 143,144 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 eb90fc0161 fix bug in assessment 5 years ago