Commit Graph

511 Commits (663c8d110480da6b098db1aa68f774d583042719)

Author SHA1 Message Date
mosazaid 663c8d1104 Merge branch 'development' into referral-outpatient 4 years ago
Mohammad Aljammal f6922ee41a Merge branch 'live_care_fixes' into 'development'
Live care fixes

See merge request Cloud_Solution/doctor_app_flutter!724
4 years ago
mosazaid ec9f628b67 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
4 years ago
Elham Rababah d57b331df2 add timer 4 years ago
mosazaid 400420bd4d Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
4 years ago
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
4 years ago
mosazaid 0fe6d880fd add livecare send instructions 4 years ago
mosazaid 5d0a7a4045 livecare changes 4 years ago
hussam al-habibeh 25583d7bee Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favourite_prescription
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
4 years ago
hussam al-habibeh 6989235334 Live care Is Login service 4 years ago
mosazaid b36ddf9317 add prescription to procedure type 4 years ago
mosazaid bc48d915c6 procedure refactoring 4 years ago
mosazaid 9454e9d8af working on procedure refactoring 4 years ago
Mohammad Aljammal e336821f65 fix lab result 5 years ago
Mohammad Aljammal 3c325ef199 fix load procedure 5 years ago
mosazaid f75ac64cad procedure get template 5 years ago
Mohammad Aljammal 6620c79478 fix ui issues 5 years ago
hussam al-habibeh e068009527 prescription form 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 ac701c9806 fix live care issues 5 years ago
mosazaid 73cf681e9d lab-result-special 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
hussam al-habibeh 17cca30b17 procedure changes 5 years ago
mosazaid 957cf96c16 Merge branch 'development' into medical-profile-services 5 years ago
Elham Rababah 1367f2bebb add translation 5 years ago
mosazaid 0ed0dbb5aa livecare changes 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 172b457092 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 5 years ago
hussam al-habibeh c182928a5d favourite template Procedure service 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
mosazaid 2fabe85b30 Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid deb126fdd5 meical report changes 5 years ago
hussam al-habibeh 066acc404a Procedure template service 5 years ago
Mohammad Aljammal a525787c19 Merge branch 'live_care' into 'development'
Live care

See merge request Cloud_Solution/doctor_app_flutter!668
5 years ago
mosazaid 9e80a1879e Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/locator.dart
5 years ago
mosazaid fa830cf4da changes 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
Elham Rababah 515955663a add verification 5 years ago
hussam al-habibeh 3b800bcd19 favourite procedure templates 5 years ago
mosazaid 6192d9a84f working on medical-profile 5 years ago
Elham Rababah 9b34c2c833 first step from live care 5 years ago
hussam al-habibeh 6b6243232c Procedure template service 5 years ago