Commit Graph

64 Commits (18d58e70378f7d1e972756e7d23ac3d47aba6de5)

Author SHA1 Message Date
Elham Rababah 74d315b887 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah bb651478a0 Finish subjective 5 years ago
Elham Rababah 9b0731d5c8 check activation code 5 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 5 years ago
Elham Rababah a3dff8c9f8 Post Allergies service 5 years ago
Elham Rababah ef6b1bc50e add master lookups 5 years ago
Elham Rababah 81352c2b0e small fix. 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
Elham Rababah 4eee5cd9d8 new login type 5 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 5 years ago
Elham Rababah 0d8455faa7 Finish medicine search design 6 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
6 years ago
Sultan Khan 6eb2da3770 voice search 6 years ago
hussam al-habibeh efc5db9f5b versionID update 6 years ago
Sultan Khan 3f7ef48fd5 live care chages 6 years ago
hussam al-habibeh acaaca314e get clinic list after changing the language 6 years ago
hussam al-habibeh d866d8b9de get clinic list 6 years ago
Mohammad ALjammal c671059a03 fix issues in video call 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
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
Sultan Khan 93936c3c55 video call screen added 6 years ago
ibrahim albitar ee8d481504 live care web service 6 years ago
Mohammad ALjammal aff8f87a2f fix merge issues 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
ibrahim albitar 8da67db69f fix patient type dropdown 6 years ago
Mohammad ALjammal a3730e4efb fix issues with sultan branch 6 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
6 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 6 years ago
ibrahim albitar 4638ba56a2 jira fixes 6 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
6 years ago
unknown ce5ee4a21e Merge branch 'develop' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/patients_provider.dart
	lib/routes.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
unknown 39cc4fa4bf refere to doctor 6 years ago
Amjad Amireh d136537b44 Modify Patiant screen List style 6 years ago
Elham Rababah 1e507cca3e finish resend code 6 years ago
Elham Rababah 40eb7f8064 improve vital sgin and return the correct color to login header 6 years ago
Salman Afzal 50e9dc0980 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	pubspec.yaml
6 years ago
Amjad Amireh c792aa1fc7 Change design patiant profile 6 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 61674bec47 new pages 6 years ago
Amjad Amireh 69a618018d MyPrefered Patiant 6 years ago
unknown 0c112ebca5 finished new screens 6 years ago
unknown 8c46c93e86 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 9f4802c225 progress note 6 years ago
Mohammad ALjammal 9572e16627 done My Referral Patient and create Base App Client 6 years ago
ibrahim albitar 7f5831335b Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!70
6 years ago
unknown 1ee2655e63 add new screens 6 years ago
Mohammad ALjammal 1f33e1a901 Add fix data for request in config file 6 years ago