Mohammad Aljammal
|
146a53a6e5
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/config/config.dart
lib/models/pharmacies/pharmacies_List_request_model.dart
lib/screens/medicine/medicine_search_screen.dart
|
6 years ago |
Sultan Khan
|
6eb2da3770
|
voice search
|
6 years ago |
hussam al-habibeh
|
efc5db9f5b
|
versionID update
|
6 years ago |
|
hussam al-habibeh
|
ba72d40deb
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
|
hussam al-habibeh
|
b6d2cdb1db
|
fixing clinic name in app reopening
|
6 years ago |
|
Sultan Khan
|
3f7ef48fd5
|
live care chages
|
6 years ago |
|
hussam al-habibeh
|
d449086f9a
|
Fixing Clinic name in app reopening
|
6 years ago |
Mohammad ALjammal
|
d4b3e42070
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
Elham Rababah
|
287bb20d12
|
fix issues ios
|
6 years ago |
|
Mohammad ALjammal
|
d5825ccb85
|
fix issues
|
6 years ago |
|
Mohammad ALjammal
|
d22ce32cdb
|
add call back android
|
6 years ago |
|
hussam al-habibeh
|
acaaca314e
|
get clinic list after changing the language
|
6 years ago |
|
hussam al-habibeh
|
aa57f4c4d7
|
get clinic list after changing the language
|
6 years ago |
|
hussam al-habibeh
|
629ccbeda8
|
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
|
d866d8b9de
|
get clinic list
|
6 years ago |
|
Mohammad Aljammal
|
9dc1c27334
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!143
|
6 years ago |
|
Sultan Khan
|
8a9d20990b
|
Video call page updated
|
6 years ago |
|
Sultan Khan
|
cad6892c8b
|
Video call page updated
|
6 years ago |
ibrahim albitar
|
98950890a0
|
Add User Guid Module
|
6 years ago |
|
Sultan Khan
|
b66eebfd10
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
3b0aff2efa
|
overflow issue and model mapped
|
6 years ago |
|
Mohammad ALjammal
|
c671059a03
|
fix issues in video call
|
6 years ago |
|
Mohammad ALjammal
|
270d7ffa6d
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/main.dart
|
6 years ago |
|
Mohammad ALjammal
|
7cc1c36ab4
|
change Medicine Provider to use BaseAppClient
|
6 years ago |
|
Sultan Khan
|
dd3154a498
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
Sultan Khan
|
bde86ef829
|
live care features added.
|
6 years ago |
|
Mohammad ALjammal
|
42a639f8b8
|
integration with opentok ios
|
6 years ago |
|
Mohammad ALjammal
|
990d36d804
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
|
Mohammad ALjammal
|
868b118243
|
integration with OpenTok android
|
6 years ago |
Elham
|
7fe2a96065
|
Merge branch 'hussam' into 'development'
translation 'updates'
See merge request Cloud_Solution/doctor_app_flutter!136
|
6 years ago |
|
hussam al-habibeh
|
000315ac0e
|
translation 'updates'
|
6 years ago |
|
ibrahim albitar
|
c07f84ff78
|
fixing and enhancments
|
6 years ago |
|
Sultan Khan
|
f052ffc8f3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
93936c3c55
|
video call screen added
|
6 years ago |
|
Elham
|
c35c6f7444
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!134
|
6 years ago |
|
Elham Rababah
|
89241460da
|
change clinic name
|
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 |
|
Elham Rababah
|
bd3ce0a4d4
|
refactor models
|
6 years ago |
erababah
|
cad096d8c7
|
fix issue on ios and improve structure by Elham & mohammad
|
6 years ago |
|
Mohammad ALjammal
|
aff8f87a2f
|
fix merge issues
|
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 |
|
hussam al-habibeh
|
ea78db6a75
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
# Conflicts:
# lib/config/localized_values.dart
# lib/screens/dashboard_screen.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
hussam al-habibeh
|
b63d8906bc
|
Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/profile_screen.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
|
a02fe9c83d
|
translation stage two
|
6 years ago |
|
ibrahim albitar
|
fc1d4c9a9b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
6 years ago |
|
ibrahim albitar
|
57708de8e4
|
pharmacies screen scrollview
|
6 years ago |
amjad nabil amireh
|
640829f454
|
Merge branch 'Amjad_search' into 'development'
Modify patiant screen icon avatar
See merge request Cloud_Solution/doctor_app_flutter!121
|
6 years ago |