Commit Graph

396 Commits (0a33d5fd0777f84deb0cee1a8f3b172bf1fbcb10)

Author SHA1 Message Date
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
5 years ago
Sultan Khan bde86ef829 live care features added. 5 years ago
Elham 7fe2a96065 Merge branch 'hussam' into 'development'
translation 'updates'

See merge request Cloud_Solution/doctor_app_flutter!136
5 years ago
hussam al-habibeh 000315ac0e translation 'updates' 5 years ago
Sultan Khan 93936c3c55 video call screen added 5 years ago
ibrahim albitar ee8d481504 live care web service 5 years ago
Mohammad ALjammal aff8f87a2f fix merge issues 5 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
5 years ago
ibrahim albitar 8da67db69f fix patient type dropdown 5 years ago
Mohammad ALjammal a3730e4efb fix issues with sultan branch 5 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
5 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 5 years ago
ibrahim albitar 4638ba56a2 jira fixes 5 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
5 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
5 years ago
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
unknown 39cc4fa4bf refere to doctor 5 years ago
Amjad Amireh d136537b44 Modify Patiant screen List style 5 years ago
Elham Rababah 1e507cca3e finish resend code 5 years ago
Elham Rababah 40eb7f8064 improve vital sgin and return the correct color to login header 5 years ago
Salman Afzal 50e9dc0980 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	pubspec.yaml
5 years ago
Amjad Amireh c792aa1fc7 Change design patiant profile 5 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 5 years ago
unknown 61674bec47 new pages 5 years ago
Amjad Amireh 69a618018d MyPrefered Patiant 5 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
unknown b94011af47 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 35205b7024 patient medical info 6 years ago
Elham Rababah de6f814f56 change client to AppClient 6 years ago
unknown 80b6716091 call phramicies 6 years ago
unknown ae524100f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
Amjad Amireh 3e25f2c0f4 Patiant search dropdown design 6 years ago
Elham a7807a7e6d Revert "Merge branch 'Amjad_search' into 'master'"
This reverts merge request !39
6 years ago
Amjad Amireh 3f821e0c05 update pataintDesign 6 years ago
unknown c30fcbc2b5 pharmacies list 6 years ago
unknown a59a2d5ad3 pharmacy web services 6 years ago
Amjad Amireh d7b7cc998e Patiant search 6 years ago
unknown a5c62323b0 date picker issue 6 years ago
Elham Rababah c38af9da48 add base url and change the mobile number to mine 6 years ago
Elham Rababah ed14157e76 first step from user login 6 years ago