Commit Graph

107 Commits (f4351abc101cf74d0f6a958148bbabccf5753745)

Author SHA1 Message Date
Elham Rababah 8980fc03aa Finish Patient search design 4 years ago
Elham Rababah 0d8455faa7 Finish medicine search design 4 years ago
Elham Rababah 871bd6ab20 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/app_text_form_field.dart
4 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 4 years ago
Mohammad Aljammal 2e4f9fa335 Merge remote-tracking branch 'origin/development' into development 4 years ago
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
4 years ago
Elham Rababah e37a3e8ce1 Finish dashboard screen design 4 years ago
Sultan Khan 6eb2da3770 voice search 4 years ago
hussam al-habibeh efc5db9f5b versionID update 4 years ago
Sultan Khan e942999784 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 3f7ef48fd5 live care chages 4 years ago
hussam al-habibeh d3bb85129c LogIn function refactoring 4 years ago
hussam al-habibeh acaaca314e get clinic list after changing the language 4 years ago
hussam al-habibeh aa57f4c4d7 get clinic list after changing the language 4 years ago
hussam al-habibeh d866d8b9de get clinic list 4 years ago
Mohammad ALjammal c671059a03 fix issues in video call 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
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
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
ibrahim albitar 33979f4838 Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
ibrahim albitar ee8d481504 live care web service 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
hussam al-habibeh 8f04edb450 Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/landing_page.dart
4 years ago
Mohammad ALjammal aff8f87a2f fix merge issues 4 years ago
hussam al-habibeh c486d7f357 translation stage three 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
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
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
ibrahim albitar 73844dd4f2 Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
ibrahim albitar 8da67db69f fix patient type dropdown 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 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 692674fac0 merge ibrahim 4 years ago
ibrahim albitar 4638ba56a2 jira fixes 4 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
4 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 4 years ago
Elham Rababah 3e05a58dd7 delete app client 4 years ago
Mohammad ALjammal eb09cda2a1 fix issues in patients provider 4 years ago
Elham Rababah d4ba01de5b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah a42f06c9ff modify hospital provider to make it call app base 4 years ago