Elham
|
2fe33bd57d
|
Merge branch 'hussam' into 'development'
LogIn function refactoring
See merge request Cloud_Solution/doctor_app_flutter!152
|
6 years ago |
hussam al-habibeh
|
d3bb85129c
|
LogIn function refactoring
|
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 |
Elham Rababah
|
28ffcb12a2
|
Merge branch 'open_tok_call_back' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
6ea72f5ffa
|
make things daynamic
|
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
|
eb2995ea25
|
Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/providers/auth_provider.dart
lib/util/helpers.dart
|
6 years ago |
Elham
|
8bff0e1504
|
Merge branch 'elham' into 'development'
fix lang in clinic name & get profile
See merge request Cloud_Solution/doctor_app_flutter!141
|
6 years ago |
Elham Rababah
|
ec4a784b9b
|
fix lang in clinic name & get profile
|
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
|
a51a312eb4
|
fix base app client
|
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 |
hussam al-habibeh
|
0e471aaa63
|
language setup on logout
|
6 years ago |
hussam al-habibeh
|
420cc0622c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam al-habibeh
|
5172703a32
|
setup language on logout
|
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
|
3ef9ca1a04
|
Json data translation
|
6 years ago |
hussam al-habibeh
|
000315ac0e
|
translation 'updates'
|
6 years ago |
ibrahim albitar
|
c07f84ff78
|
fixing and enhancments
|
6 years ago |
ibrahim albitar
|
339c8dfb00
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim
|
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 |
ibrahim albitar
|
ee8d481504
|
live care web service
|
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 |
Elham Rababah
|
c62340e834
|
modify IMEI
|
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 |
hussam al-habibeh
|
1476c151e2
|
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
|
8f04edb450
|
Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/landing_page.dart
|
6 years ago |
Mohammad Aljammal
|
5062d942c3
|
Merge branch 'mohammad' into 'development'
Mohammad
See merge request Cloud_Solution/doctor_app_flutter!126
|
6 years ago |
Mohammad ALjammal
|
aff8f87a2f
|
fix merge issues
|
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 |
Mohammad ALjammal
|
f22eec909b
|
create internet connection page Mohammad & Elham
|
6 years ago |
Sultan Khan
|
b26e750abb
|
drawer design updated
|
6 years ago |
Mohammad Aljammal
|
934236ac82
|
Merge branch 'mohammad' into 'development'
fix issues in login
See merge request Cloud_Solution/doctor_app_flutter!123
|
6 years ago |
Mohammad ALjammal
|
6747495ea8
|
fix issues in login
|
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 |
Sultan Khan
|
e71b315d75
|
icon updated
|
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 |
Amjad Amireh
|
4e62947df2
|
Modify patiant screen icon avatar
|
6 years ago |
Elham
|
69b02e29c5
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!120
|
6 years ago |
Elham Rababah
|
574a951fcf
|
finish clinic exept design
|
6 years ago |
hussam alhababieh
|
b0005e72f9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam alhababieh
|
b4570d7bd1
|
translation for pages stage one
|
6 years ago |
Elham Rababah
|
165d697e33
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
5779fb9ad7
|
change profile based on change clinic
|
6 years ago |
Amjad Amireh
|
230bdb2430
|
Modify Dr profile data dynamic size
|
6 years ago |
Elham Rababah
|
ef8dfc5b5f
|
first step form change clinic
|
6 years ago |
Mohammad Aljammal
|
7be7d715fe
|
Merge branch 'mohammad' into 'development'
Mohammad
See merge request Cloud_Solution/doctor_app_flutter!117
|
6 years ago |
Mohammad ALjammal
|
94dbecca4a
|
fix issues in login
|
6 years ago |
ibrahim albitar
|
73844dd4f2
|
Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
6 years ago |
ibrahim albitar
|
8da67db69f
|
fix patient type dropdown
|
6 years ago |
ibrahim albitar
|
09ca836ea7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
6 years ago |
ibrahim albitar
|
6fd43a281d
|
fixing
|
6 years ago |
Mohammad ALjammal
|
0dad77bfa2
|
fix issues in login
|
6 years ago |
Mohammad ALjammal
|
69173e8c46
|
fix issues in login focus
|
6 years ago |
amjad nabil amireh
|
67c0531fe1
|
Merge branch 'Amjad_search' into 'development'
Modify date in time in search patient
See merge request Cloud_Solution/doctor_app_flutter!116
|
6 years ago |
Amjad Amireh
|
66627534a9
|
Modify date in time in search patiant
|
6 years ago |
Mohammad Aljammal
|
f6aec27788
|
Merge branch 'mohammad' into 'development'
fix issues in Patient
See merge request Cloud_Solution/doctor_app_flutter!115
|
6 years ago |
Mohammad ALjammal
|
d52429564d
|
fix issues in Patient
|
6 years ago |
hussam alhababieh
|
dcbf1312b7
|
translate dashboard/patient search
|
6 years ago |
hussam alhababieh
|
097d8df8c0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam alhababieh
|
b178f08278
|
translate dashboard and patient search
|
6 years ago |
Mohammad ALjammal
|
b758ae8196
|
fix issues
|
6 years ago |
Mohammad ALjammal
|
fa9e1a344a
|
fix issues
|
6 years ago |
Mohammad ALjammal
|
c7f1c6d174
|
Merge branch 'ibrahim-merge' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
lib/screens/auth/login_screen.dart
lib/screens/medicine/medicine_search_screen.dart
lib/widgets/auth/verfiy_account.dart
|
6 years ago |
Mohammad ALjammal
|
a3730e4efb
|
fix issues with sultan branch
|
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 |
Mohammad ALjammal
|
edd25ff437
|
Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/config/config.dart
|
6 years ago |
Mohammad ALjammal
|
2877aa171e
|
Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/widgets/auth/verfiy_account.dart
|
6 years ago |
Mohammad ALjammal
|
692674fac0
|
merge ibrahim
|
6 years ago |
Mohammad ALjammal
|
80664439d9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
|
6 years ago |