hussam alhababieh
|
3c55af7adc
|
Merge branch 'development' into 'tasks-translation'
# Conflicts:
# lib/screens/prescription/add_prescription_form.dart
|
6 years ago |
|
hussam al-habibeh
|
7c800bdab4
|
medical file fix
|
6 years ago |
Elham Rababah
|
00543a759a
|
fix remarks in allergies
|
6 years ago |
|
Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
6 years ago |
|
Elham Rababah
|
cbf850da2f
|
fix DA-201
|
6 years ago |
Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
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 |
|
hussam al-habibeh
|
bada160cf5
|
Search Medacation
|
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 |
|
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
|
ba263ada44
|
fix DA-201
|
6 years ago |
|
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
6 years ago |
|
Elham Rababah
|
53e88620ec
|
fix DA-230
|
6 years ago |
|
Sultan Khan
|
d55ce4c1ec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Mohammad Aljammal
|
5af6210785
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!263
|
6 years ago |
|
Mohammad Aljammal
|
574e1525d9
|
Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix
See merge request Cloud_Solution/doctor_app_flutter!262
|
6 years ago |
mosazaid
|
cd95a581f0
|
simple changes
|
6 years ago |
|
Sultan Khan
|
896078507f
|
gub fixes
|
6 years ago |
|
hussam al-habibeh
|
e133a014e8
|
Prescription & medical file fix
|
6 years ago |
|
Elham Rababah
|
e32c360f85
|
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
|
8360179050
|
fix DA-195
|
6 years ago |
|
Elham Rababah
|
c11f195e72
|
fix DA-192
|
6 years ago |
|
Elham Rababah
|
d53493aa52
|
fix DA-237
|
6 years ago |
|
Elham Rababah
|
c6156921e8
|
fix DA-197
|
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 |
|
Sultan Khan
|
417ca9401b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
a99b3847ac
|
login completed
|
6 years ago |
|
Elham Rababah
|
763d6bb49f
|
finish add loader
|
6 years ago |
|
hussam al-habibeh
|
5150f9b93d
|
Prescription & procedure body update
|
6 years ago |
|
Elham Rababah
|
bc8a90ef2c
|
first step from fix loader
|
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
|
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
|
d9d4e22531
|
Merge branch 'development' into feature-ucaf
|
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 |
|
hussam alhababieh
|
d87aeb290f
|
Merge branch 'development' into 'procedure-fix'
# Conflicts:
# lib/landing_page.dart
|
6 years ago |
|
hussam al-habibeh
|
b0410dc744
|
Procedure updates
|
6 years ago |
|
hussam al-habibeh
|
debcad3a3d
|
prescription
|
6 years ago |
|
hussam al-habibeh
|
4b54ca7d47
|
prescription
|
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
|
722e1a5c41
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
ad99cebf02
|
login and drug to drug
|
6 years ago |