Commit Graph

420 Commits (693f57a13e95f2f2d312dc18a2e1da49aab9860e)

Author SHA1 Message Date
Mohammad Aljammal 6dfcbcca12 Merge branch 'procedure_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedure_refactoring
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
5 years ago
mosazaid 0afe3b3afd livecare changes 5 years ago
mosazaid 5d0a7a4045 livecare changes 5 years ago
hussam al-habibeh c800219428 Live Care Is Login Service 5 years ago
mosazaid ea0658c05c Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/viewModel/procedure_View_model.dart
5 years ago
Elham Rababah 8dbfb92f88 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_appointment
 Conflicts:
	ios/Podfile.lock
5 years ago
Elham Rababah 9692e54b97 fix login issue
# Conflicts:
#	lib/core/viewModel/authentication_view_model.dart
#	lib/root_page.dart
#	lib/widgets/shared/app_drawer_widget.dart
5 years ago
mosazaid bc48d915c6 procedure refactoring 5 years ago
hussam al-habibeh 519e6f2fec Prescription favourite templates 5 years ago
Mohammad Aljammal 3c325ef199 fix load procedure 5 years ago
Mohammad Aljammal 80a751ae4d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates 5 years ago
mosazaid b16dc2092b liveCare cahnges 5 years ago
Mohammad Aljammal 2b6736ed6a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates
 Conflicts:
	lib/screens/procedures/add-favourite-procedure.dart
5 years ago
Mohammad Aljammal 725c87fe8b Add favorite procedure templates for lab and radiology 5 years ago
mosazaid 390a34dd81 procedure hot fix 5 years ago
mosazaid f75ac64cad procedure get template 5 years ago
Mohammad Aljammal 6620c79478 fix ui issues 5 years ago
Mohammad Aljammal 280f87e514 fix live care issues 5 years ago
Mohammad Aljammal ad036f7133 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into text-form-field
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 281a807ec8 fix live care 5 years ago
mosazaid 41515b311c lab-result-fixes 5 years ago
Mohammad Aljammal e89d5b13ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services 5 years ago
Mohammad Aljammal 7d423d9457 Merge branch 'prescription_changes' into 'development'
procedure changes

See merge request Cloud_Solution/doctor_app_flutter!691
5 years ago
Mohammad Aljammal ac701c9806 fix live care issues 5 years ago
hussam al-habibeh 764578f28e procedure changes 5 years ago
Elham Rababah fdc23ce932 Merge branches 'development' and 'live_care_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_patient
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Mohammad Aljammal b9831adeb2 Merge branch 'medical-profile-services' into 'development'
Medical profile services

See merge request Cloud_Solution/doctor_app_flutter!689
5 years ago
Elham Rababah 401516403f first step from show Video call 5 years ago
mosazaid 0cd7fa0cb2 working on livecare 5 years ago
Mohammad Aljammal e313722743 fix bug when logout 5 years ago
mosazaid 8b2c7f1a05 livecare 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
Elham Rababah 8e140abee9 make pending service dynamic 5 years ago
Elham Rababah 5778a4a887 view list of Live care patient 5 years ago
Elham Rababah c4b434497a Merge branches 'development' and 'html_editor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
 Conflicts:
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 5 years ago
mosazaid 70d171a599 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 67e0cac742 add livecare to home 5 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 5 years ago
Mohammad Aljammal 16dac03b24 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
 Conflicts:
	lib/locator.dart
	lib/screens/home/home_screen.dart
5 years ago
Mohammad Aljammal f6539c82a6 add live care card in home page 5 years ago
hussam al-habibeh 3801d7b59a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
hussam al-habibeh e1d00b87ad favourite template Procedure service 5 years ago
mosazaid 9e552668c7 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 2fabe85b30 Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 1cc55d809c fix authentication service 5 years ago
mosazaid deb126fdd5 meical report changes 5 years ago
Mohammad Aljammal a97a331d87 fix bugs in change the clinic, login page when get the projects and add the special Result 5 years ago
hussam al-habibeh 066acc404a Procedure template service 5 years ago
Mohammad Aljammal 57fcd2cdeb fix home page design 5 years ago