Commit Graph

205 Commits (a47e9b69f5b4e685e413f7064a8c59b2513e8ea5)

Author SHA1 Message Date
hussam al-habibeh d3bf97fdd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_buttons_widget.dart
	lib/widgets/shared/app_text_form_field.dart
	lib/widgets/shared/app_texts_widget.dart
5 years ago
hussam al-habibeh 1ce6571668 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/refer_patient_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_text_form_field.dart
5 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
mosazaid 4ac8fe4681 finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral

# Conflicts:
#	lib/client/base_app_client.dart
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 7cefbb4dbd add referral pages 5 years ago
Sultan Khan 8d58348267 dashboard changes 5 years ago
Elham Rababah c15300125e First step objective_page.dart 5 years ago
Elham Rababah 518c30bdeb Merge branches 'SOAP' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 5 years ago
hussam al-habibeh cbb8937b1d '12/14' 5 years ago
hussam al-habibeh 7de6a8e99f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/landing_page.dart
	lib/screens/patients/profile/refer_patient_screen.dart
5 years ago
hussam al-habibeh c581638e00 refer_patient_screen 'not finshed' 5 years ago
Elham Rababah 9f19b2566f finish refactor provider 5 years ago
Elham Rababah 64dbcce06f finish and remove patient provider 5 years ago
Elham 6057e6a266 Merge branch 'refactor' into 'development'
Refactor

See merge request Cloud_Solution/doctor_app_flutter!180
5 years ago
Elham 746765f4d7 Merge branch 'design-updates' into 'development'
patients_screen design update

See merge request Cloud_Solution/doctor_app_flutter!179
5 years ago
Elham Rababah 1b1e8f0712 second step from patient provider 5 years ago
hussam al-habibeh 6f90c31f9f patients_screen design update 5 years ago
Elham Rababah 6ab73916eb first step from patient provider 5 years ago
mosazaid e5341e3031 Merge branch 'development' into replay-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 5 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 5 years ago
hussam al-habibeh 911921e0b8 in-patient && out-patient 5 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 5 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 5 years ago
Elham Rababah f1721b686d fix loader inside pharmacies_list 5 years ago
Elham Rababah b308dc5826 change doctor app icons and optimization 6 years ago
Elham Rababah 8980fc03aa Finish Patient search design 6 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 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
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
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
hussam alhababieh a02fe9c83d translation stage two 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 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
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 f6aec27788 Merge branch 'mohammad' into 'development'
fix issues in Patient

See merge request Cloud_Solution/doctor_app_flutter!115
6 years ago