Commit Graph

587 Commits (e37a3e8ce1d515d3a5b2af999290106370c15ac8)
 

Author SHA1 Message Date
Elham b0dd322906 Merge branch 'hussam' into 'development'
Hussam

See merge request Cloud_Solution/doctor_app_flutter!139
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
Mohammad Aljammal 57f3f47570 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!137
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 95a3aaaf37 Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 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
Mohammad Aljammal b268738f89 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!135
6 years ago
ibrahim albitar 33979f4838 Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 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
Elham 61b2edd04a Merge branch 'hussam' into 'development'
Translation stage five

See merge request Cloud_Solution/doctor_app_flutter!133
6 years ago
hussam al-habibeh 91ffdabd73 Translation stage five 6 years ago
Elham Rababah c62340e834 modify IMEI 6 years ago
hussam alhababieh 063ac10df5 Merge branch 'hussam' into 'development'
Translation stage four

See merge request Cloud_Solution/doctor_app_flutter!132
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 7c4e3defd3 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!131
6 years ago
Elham de5a7f7dad Merge branch 'models_ref' into 'development'
Models ref

See merge request Cloud_Solution/doctor_app_flutter!130
6 years ago
Elham Rababah bd3ce0a4d4 refactor models 6 years ago
Mohammad Aljammal b917ab2899 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!129
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 e1bf150737 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!127
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 d31515d441 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!124
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