Mohammad ALjammal
|
270d7ffa6d
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/main.dart
|
4 years ago |
|
Mohammad ALjammal
|
7cc1c36ab4
|
change Medicine Provider to use BaseAppClient
|
4 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
|
4 years ago |
|
Sultan Khan
|
bde86ef829
|
live care features added.
|
4 years ago |
|
Mohammad ALjammal
|
42a639f8b8
|
integration with opentok ios
|
4 years ago |
|
Mohammad ALjammal
|
990d36d804
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
4 years ago |
|
Mohammad ALjammal
|
868b118243
|
integration with OpenTok android
|
4 years ago |
Elham
|
7fe2a96065
|
Merge branch 'hussam' into 'development'
translation 'updates'
See merge request Cloud_Solution/doctor_app_flutter!136
|
4 years ago |
hussam al-habibeh
|
000315ac0e
|
translation 'updates'
|
4 years ago |
ibrahim albitar
|
c07f84ff78
|
fixing and enhancments
|
4 years ago |
|
Sultan Khan
|
f052ffc8f3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
93936c3c55
|
video call screen added
|
4 years ago |
|
Elham
|
c35c6f7444
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!134
|
4 years ago |
Elham Rababah
|
89241460da
|
change clinic name
|
4 years ago |
|
hussam al-habibeh
|
91ffdabd73
|
Translation stage five
|
4 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
|
4 years ago |
|
hussam al-habibeh
|
054933b280
|
Translation stage four
|
4 years ago |
|
Elham Rababah
|
bd3ce0a4d4
|
refactor models
|
4 years ago |
erababah
|
cad096d8c7
|
fix issue on ios and improve structure by Elham & mohammad
|
4 years ago |
|
Mohammad ALjammal
|
aff8f87a2f
|
fix merge issues
|
4 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
|
4 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
|
4 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
|
4 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
|
4 years ago |
|
hussam alhababieh
|
a02fe9c83d
|
translation stage two
|
4 years ago |
|
ibrahim albitar
|
fc1d4c9a9b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
4 years ago |
|
ibrahim albitar
|
57708de8e4
|
pharmacies screen scrollview
|
4 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
|
4 years ago |
Amjad Amireh
|
4e62947df2
|
Modify patiant screen icon avatar
|
4 years ago |
|
Elham
|
69b02e29c5
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!120
|
4 years ago |
|
Elham Rababah
|
574a951fcf
|
finish clinic exept design
|
4 years ago |
|
hussam alhababieh
|
b0005e72f9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
4 years ago |
|
hussam alhababieh
|
b4570d7bd1
|
translation for pages stage one
|
4 years ago |
|
Elham Rababah
|
165d697e33
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
4 years ago |
|
Elham Rababah
|
5779fb9ad7
|
change profile based on change clinic
|
4 years ago |
|
Amjad Amireh
|
230bdb2430
|
Modify Dr profile data dynamic size
|
4 years ago |
|
Elham Rababah
|
ef8dfc5b5f
|
first step form change clinic
|
4 years ago |
|
ibrahim albitar
|
09ca836ea7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
4 years ago |
|
ibrahim albitar
|
6fd43a281d
|
fixing
|
4 years ago |
|
Mohammad Aljammal
|
f6aec27788
|
Merge branch 'mohammad' into 'development'
fix issues in Patient
See merge request Cloud_Solution/doctor_app_flutter!115
|
4 years ago |
|
Mohammad ALjammal
|
d52429564d
|
fix issues in Patient
|
4 years ago |
|
hussam alhababieh
|
dcbf1312b7
|
translate dashboard/patient search
|
4 years ago |
|
hussam alhababieh
|
097d8df8c0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
4 years ago |
|
hussam alhababieh
|
b178f08278
|
translate dashboard and patient search
|
4 years ago |
|
Mohammad ALjammal
|
b758ae8196
|
fix issues
|
4 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
|
4 years ago |
|
Mohammad ALjammal
|
a3730e4efb
|
fix issues with sultan branch
|
4 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
|
4 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
|
4 years ago |
|
Mohammad ALjammal
|
692674fac0
|
merge ibrahim
|
4 years ago |