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 |
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 |
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 |
Mohammad Aljammal
|
6d473be371
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!273
|
6 years ago |
hussam al-habibeh
|
35bc8c03a4
|
bug fixing
|
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
|
13c879654b
|
DA-250: fix age
|
6 years ago |
hussam al-habibeh
|
fb8381ea61
|
bugs fix
|
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
|
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 |
Elham Rababah
|
cc92fe56c6
|
fix DA-154,DA-150
|
6 years ago |
mosazaid
|
e808d48035
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
mosazaid
|
88f1dc637f
|
some fixes
|
6 years ago |
Elham Rababah
|
c11f195e72
|
fix DA-192
|
6 years ago |
Elham Rababah
|
855ed0ac12
|
fix 145
|
6 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
|
6 years ago |
Elham Rababah
|
9674eb89d9
|
add modification on so
|
6 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
|
6 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
|
6 years ago |
hussam al-habibeh
|
1fa52e0394
|
medical dile & Order Procedure translation
|
6 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
|
6 years ago |
hussam al-habibeh
|
e67233bb21
|
medical dile & Order Procedure translation
|
6 years ago |
mosazaid
|
eae0bb443f
|
solve problem with vital signs charts depend on date
|
6 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
|
6 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
|
6 years ago |
Elham Rababah
|
6bab2e0b2d
|
fix referral patient issue
|
6 years ago |
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
6 years ago |
Sultan Khan
|
909940a6d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
40e9ab864a
|
login changes
|
6 years ago |
mosazaid
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Mohammad Aljammal
|
21114fc88f
|
Merge branch 'development' into 'feature-ucaf'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
6 years ago |
mosazaid
|
ca9f1a022b
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
6 years ago |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
6 years ago |
Elham Rababah
|
7ce1d2dd55
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
6 years ago |
Sultan Khan
|
87d90a394b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
044ad7b51a
|
offtime leave
|
6 years ago |
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
6 years ago |
Elham Rababah
|
1be8ea7dcb
|
Fix conflict
|
6 years ago |
Elham Rababah
|
ffe7e7c57f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
6 years ago |
Elham Rababah
|
c3bb408787
|
add some translations
|
6 years ago |
mosazaid
|
7983f998bd
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Sultan Khan
|
ad967e8aae
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |