Commit Graph

271 Commits (376653a3440060ec5e5ba5c32bbe90e305dea52b)

Author SHA1 Message Date
Sultan Khan 376653a344 dashboard changes 5 years ago
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
5 years ago
Elham Rababah f3220be735 fix DA-350 5 years ago
Elham Rababah f819e6353e fix DA-350 5 years ago
Sultan Khan 9ed5a294ab dashboard changes 5 years ago
Mohammad Aljammal 8deba06957 Merge branch 'fix_patient_card' into 'development'
fix PatientCard

See merge request Cloud_Solution/doctor_app_flutter!304
5 years ago
Elham Rababah c8e5a7eeef fix PatientCard 5 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 5 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
5 years ago
Elham Rababah 248367fbe9 fix DA-220 5 years ago
Elham Rababah 753ef3bfb0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Elham Rababah a5a7425a09 fix DA-149 5 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 5 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 5 years ago
Elham Rababah 34d5ac7d43 add label on assessment and fix DA-333 5 years ago
Elham Rababah 7505a6b6b0 fix  allergy 5 years ago
Elham Rababah 6a5e134527 fix  remark and step widget 5 years ago
Elham Rababah cfb9ea30cb fix : DA-335 5 years ago
Elham Rababah e652752729 fix : DA-334 5 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
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 34692b94c2 fix : DA-264 5 years ago
mosazaid de1d0283d2 some lables and translation changes and add search functionality for ListSelectDialog 5 years ago
Elham Rababah b9b5ec09e4 fix : DA-248 5 years ago
mosazaid c2df291029 DA - 286 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
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
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 13c879654b DA-250: fix age 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 00543a759a fix remarks in allergies 5 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 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 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