Elham Rababah
|
8284f1d475
|
Fix profile widget
|
6 years ago |
|
Elham Rababah
|
71b50c8404
|
First step translations
|
6 years ago |
|
Elham Rababah
|
ba14d23c05
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
|
Elham Rababah
|
e65740761a
|
add improvement on create episode
|
6 years ago |
mosazaid
|
b4f813fc2d
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/locator.dart
# lib/routes.dart
|
6 years ago |
hussam al-habibeh
|
d1a261c847
|
procedure update
|
6 years ago |
|
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
6 years ago |
|
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |
|
mosazaid
|
cb4ee05b40
|
working on ucaf
|
6 years ago |
|
Elham Rababah
|
f0fd5d30e1
|
First step from update process
|
6 years ago |
|
mosazaid
|
873ee67eb7
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |
|
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
6 years ago |
Mohammad Aljammal
|
6f2e764deb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
Conflicts:
lib/client/base_app_client.dart
lib/routes.dart
|
6 years ago |
|
Elham Rababah
|
2f273dcde8
|
add ICD10
|
6 years ago |
|
mosazaid
|
25d884c774
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/routes.dart
# lib/util/helpers.dart
# lib/util/translations_delegate_base.dart
# lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
# pubspec.lock
|
6 years ago |
|
mosazaid
|
b5c937bd86
|
Working on vitalSigns,
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/routes.dart
|
6 years ago |
|
mosazaid
|
a71da8e4ef
|
working on vital signs
|
6 years ago |
|
hussam al-habibeh
|
d3bf97fdd8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/routes.dart
lib/util/translations_delegate_base.dart
lib/widgets/shared/TextFields.dart
lib/widgets/shared/app_buttons_widget.dart
lib/widgets/shared/app_text_form_field.dart
lib/widgets/shared/app_texts_widget.dart
|
6 years ago |
|
hussam al-habibeh
|
697f17f2cd
|
prescription and procedure
|
6 years ago |
|
hussam al-habibeh
|
1ce6571668
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/routes.dart
lib/screens/patients/profile/refer_patient_screen.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
lib/widgets/shared/TextFields.dart
lib/widgets/shared/app_text_form_field.dart
|
6 years ago |
Sultan Khan
|
5585274b18
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
hussam al-habibeh
|
749e870ea2
|
get procedures get prescription
|
6 years ago |
|
Sultan Khan
|
5dcc03cfa8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
mosazaid
|
4ac8fe4681
|
finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/locator.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
7cefbb4dbd
|
add referral pages
|
6 years ago |
|
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
6 years ago |
|
Sultan Khan
|
ba2697c917
|
sick leave
|
6 years ago |
|
Sultan Khan
|
76e10459e0
|
sick leave
|
6 years ago |
|
Sultan Khan
|
97d915ef99
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
cc1a63786f
|
sick leave
|
6 years ago |
|
mosazaid
|
16821c17fc
|
re-design in-patient detail page
|
6 years ago |
|
mosazaid
|
5ed9aea5a7
|
fix HexColor library error
|
6 years ago |
|
Elham Rababah
|
53862ec1b3
|
fix bugs in patient search
|
6 years ago |
|
hussam al-habibeh
|
91ffdabd73
|
Translation stage five
|
6 years ago |
|
hussam al-habibeh
|
fb6d54faaf
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
|
hussam al-habibeh
|
054933b280
|
Translation stage four
|
6 years ago |
|
hussam al-habibeh
|
8f04edb450
|
Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/landing_page.dart
|
6 years ago |
|
hussam al-habibeh
|
c486d7f357
|
translation stage three
|
6 years ago |
Mohammad ALjammal
|
63dd8262da
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/dashboard_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
|
Sultan Khan
|
79c2de3f96
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# fonts/DoctorApp.ttf
# lib/presentation/doctor_app_icons.dart
|
6 years ago |
|
hussam alhababieh
|
b4570d7bd1
|
translation for pages stage one
|
6 years ago |
|
Mohammad ALjammal
|
b758ae8196
|
fix issues
|
6 years ago |
|
Mohammad ALjammal
|
79eb6b19d0
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/config/config.dart
lib/presentation/doctor_app_icons.dart
lib/screens/dashboard_screen.dart
lib/screens/medicine/medicine_search_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
Salman Afzal
|
11f10f1eea
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/screens/dashboard_screen.dart
# lib/screens/patients/patients_screen.dart
|
6 years ago |
ibrahim albitar
|
d3818bd3b3
|
fix
|
6 years ago |
|
Salman Afzal
|
5f6e9104d0
|
scroll change
|
6 years ago |
|
Salman Afzal
|
50e9dc0980
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# pubspec.yaml
|
6 years ago |
|
Salman Afzal
|
494a44148d
|
patient profile
|
6 years ago |
Elham Rababah
|
c5bbb0495a
|
add login logic with silent options
|
6 years ago |
unknown
|
7d1cfb7b4e
|
add new screens
|
6 years ago |