Mohammad Aljammal
|
8b992b4189
|
Merge branch 'development' into 'fix_issues'
# Conflicts:
# lib/config/localized_values.dart
|
6 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
|
6 years ago |
|
Elham Rababah
|
febdadc924
|
fix : DA-264
|
6 years ago |
|
Elham Rababah
|
34692b94c2
|
fix : DA-264
|
6 years ago |
mosazaid
|
de1d0283d2
|
some lables and translation changes and add search functionality for ListSelectDialog
|
6 years ago |
|
Elham Rababah
|
b9b5ec09e4
|
fix : DA-248
|
6 years ago |
|
mosazaid
|
c2df291029
|
DA - 286 Fix
|
6 years ago |
|
Mohammad Aljammal
|
abcd7e9833
|
Merge branch 'fix_issues' into 'development'
remark fix in allergies
See merge request Cloud_Solution/doctor_app_flutter!280
|
6 years ago |
|
Elham Rababah
|
6820e2d097
|
remark fix in allergies
|
6 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
|
6 years ago |
|
Mohammad Aljammal
|
75efcde0bc
|
fix ios
|
6 years ago |
|
Mohammad Aljammal
|
fa94b60711
|
Merge branch 'feature-ucaf' into 'development'
translation
See merge request Cloud_Solution/doctor_app_flutter!278
|
6 years ago |
|
Mohammad Aljammal
|
3cfb88b313
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!277
|
6 years ago |
|
mosazaid
|
2273808333
|
translation
|
6 years ago |
|
mosazaid
|
cca4e33fce
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Sultan Khan
|
ed3b42d721
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
d34744e168
|
bug fix
|
6 years ago |
|
mosazaid
|
ebc5ba7743
|
some fixes
|
6 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
|
6 years ago |
|
mosazaid
|
e75318799f
|
Merge branch 'development' into feature-ucaf
|
6 years ago |
|
mosazaid
|
ac9fd8c936
|
samll fixes for labels and msges
|
6 years ago |
|
Elham Rababah
|
c065dbbdb3
|
Fixed DA:266
|
6 years ago |
|
Elham Rababah
|
913ffc3052
|
Fix DA-260,DA-267
|
6 years ago |
|
Elham Rababah
|
13c879654b
|
DA-250: fix age
|
6 years ago |
|
Mohammad Aljammal
|
81fdcb2d8d
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!271
|
6 years ago |
|
Elham Rababah
|
68d27a451d
|
fix general issue
|
6 years ago |
|
Sultan Khan
|
b92bc85e8f
|
bug fixes
|
6 years ago |
|
Elham Rababah
|
9ddfbd3e66
|
fix issue on app drawer
|
6 years ago |
|
Sultan Khan
|
d5d7ea6c49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
63e8ee8dd0
|
sick leave
|
6 years ago |
|
Elham Rababah
|
00543a759a
|
fix remarks in allergies
|
6 years ago |
|
Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
6 years ago |
|
Elham Rababah
|
484c737836
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
6 years ago |
|
Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
|
Mohammad Aljammal
|
b89af8a5ab
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!266
|
6 years ago |
|
Sultan Khan
|
135c852e8c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
735698ce90
|
bug fixes
|
6 years ago |
|
Elham Rababah
|
f0cd33ae43
|
fix issue on assessment design
|
6 years ago |
|
Elham Rababah
|
1de25aae2f
|
fix issue on assessment design
|
6 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
|
6 years ago |
|
hussam al-habibeh
|
4a4cd03f63
|
Prescription date
|
6 years ago |
|
hussam al-habibeh
|
38d9881ed2
|
Prescription date
|
6 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
|
6 years ago |
|
mosazaid
|
3be693337a
|
some fixes
|
6 years ago |
|
Elham Rababah
|
4e4e6a3600
|
fix DA-151
|
6 years ago |
|
Elham Rababah
|
a7ca7fb271
|
fix DA-151
|
6 years ago |
|
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
6 years ago |
|
Sultan Khan
|
d55ce4c1ec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
mosazaid
|
cd95a581f0
|
simple changes
|
6 years ago |
|
Elham Rababah
|
cc92fe56c6
|
fix DA-154,DA-150
|
6 years ago |