Commit Graph

63 Commits (cc26053bc186c8ff0b3ba463df875331f0cc9878)

Author SHA1 Message Date
Mohammad Aljammal 5a61a3eaba Add missing page tob google analytics 5 years ago
Elham Rababah 56698a82fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
 Conflicts:
	lib/core/service/home/auth_service.dart
	lib/core/viewModel/auth_view_model.dart
	lib/core/viewModel/imei_view_model.dart
	lib/locator.dart
	lib/screens/auth/login_screen.dart
	lib/screens/home/home_screen.dart
	lib/screens/patients/patient_search/patient_search_screen.dart
	lib/widgets/auth/verification_methods.dart
5 years ago
Mohammad Aljammal 74ded739c8 fix imports 5 years ago
hussam al-habibeh 9457e04825 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/sick-leave/add-sickleave.dart
5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
Elham Rababah 663d2a942f first step from refactoring auth part 5 years ago
Elham Rababah c3c4b66271 refactor search file name 5 years ago
Sultan Khan 099bf81d52 homepage and sms popup updated 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid bbe94d2b9b Merge branch 'development' into design-fixes
# Conflicts:
#	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
#	lib/screens/patients/profile/refer_patient_screen.dart
#	lib/screens/patients/profile/referral/refer-patient-screen.dart
#	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
#	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
#	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
#	lib/screens/prescription/add_prescription_form.dart
#	lib/screens/prescription/prescription_warnings.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Elham Rababah 7579a21b83 Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
 Conflicts:
	lib/widgets/auth/login_form.dart
5 years ago
mosazaid af9bd53feb Merge branch 'development' into design-fixes
# Conflicts:
#	lib/widgets/auth/login_form.dart
5 years ago
mosazaid b8f6c35e75 working on buttons widgets 5 years ago
Mohammad Aljammal 0e459de1a3 fix pharmacies list 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
mosazaid 4b32487540 referral design and service changes 5 years ago
Sultan Khan 5c4aee849e bug fixes 5 years ago
hussam al-habibeh 9645791164 changeing add prescription behovior 5 years ago
Sultan Khan 075ae0dcaa Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5903fdd8b8 tab bar changes 5 years ago
Elham Rababah 103a1bc6fc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
5 years ago
Sultan Khan 93caeb3876 search screen updated 5 years ago
Elham Rababah 234cc57a2a return search medicine 5 years ago
Sultan Khan cf7d494944 search pages and dashboard updated 5 years ago
Sultan Khan 376653a344 dashboard changes 5 years ago
Elham Rababah 00543a759a fix remarks in allergies 5 years ago
Elham Rababah cbf850da2f fix DA-201 5 years ago
Elham Rababah ba263ada44 fix DA-201 5 years ago
Elham Rababah 763d6bb49f finish add loader 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
Elham Rababah 9f19b2566f finish refactor provider 5 years ago
Elham Rababah 58de54997a refactor search medicine Service 5 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 5 years ago
Elham Rababah f1721b686d fix loader inside pharmacies_list 5 years ago
Elham Rababah 9a18c405c7 comment code not working in good way until we fixed 5 years ago
Elham Rababah 1ad3652913 Fix issue related to pharmacies_list_screen.dart 5 years ago
Elham Rababah b308dc5826 change doctor app icons and optimization 6 years ago
Elham Rababah 0d8455faa7 Finish medicine search design 6 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
6 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 6 years ago
Sultan Khan 6eb2da3770 voice search 6 years ago
hussam al-habibeh efc5db9f5b versionID update 6 years ago
Mohammad ALjammal 7cc1c36ab4 change Medicine Provider to use BaseAppClient 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 b63d8906bc Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/profile_screen.dart
6 years ago