Commit Graph

2751 Commits (9f5e17a6bf2c8815c8a38834e8fc8ec09e412113)
 

Author SHA1 Message Date
Mohammad Aljammal b1f3cf3ece Merge branch 'outpatient_referral_change' into 'development'
outpatirnt referral changes

See merge request Cloud_Solution/doctor_app_flutter!762
3 years ago
Mohammad Aljammal f0d90c0e9a Merge branch 'video-stream-background' into 'development'
Video stream background

See merge request Cloud_Solution/doctor_app_flutter!760
3 years ago
mosazaid d839fd3545 outpatirnt referral changes 3 years ago
hussam al-habibeh 1e35b70b01 medical report fix 3 years ago
mosazaid 1bb40ddeb9 Merge branch 'development' into video-stream-background 3 years ago
mosazaid 783c74108b video isRecord change 3 years ago
Mohammad Aljammal ec3ac18a15 Merge branch 'video-stream-background' into 'development'
Video stream background

See merge request Cloud_Solution/doctor_app_flutter!759
3 years ago
Mohammad Aljammal 9303091f20 Merge branch 'medical_report_changes' into 'development'
Medical report changes

See merge request Cloud_Solution/doctor_app_flutter!757
3 years ago
mosazaid eb62fdfe21 Merge branch 'development' into video-stream-background
# Conflicts:
#	android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt
#	android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt
#	lib/core/service/VideoCallService.dart
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
3 years ago
mosazaid a7c5e1afde finish solve keybaord issue 3 years ago
mosazaid 994757b662 finish solve keybaord issue 3 years ago
hussam al-habibeh 9890d6a063 using dynimc setup id in medical report service 3 years ago
Mohammad Aljammal fc9a2a277a Merge branch 'fix_episode_no' into 'development'
Fix episode no

See merge request Cloud_Solution/doctor_app_flutter!758
3 years ago
Elham Rababah e80523749b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_episode_no
 Conflicts:
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
3 years ago
Elham Rababah 1918c2219e improve the code. 3 years ago
Elham Rababah 29eeb21e76 finalize create episode on Live care. 3 years ago
hussam al-habibeh 19548ccb1e Medical Report change status 3 years ago
Elham Rababah 80ef1a241d first step from fix episode in patient live care list 3 years ago
hussam al-habibeh bec5eb82bc update medical file service 3 years ago
hussam al-habibeh c652f40a89 add medical report new service 3 years ago
Mohammad Aljammal a5988c2885 Merge branch 'fixes' into 'development'
Fixes

See merge request Cloud_Solution/doctor_app_flutter!756
3 years ago
Elham Rababah 74b17c5fc9 Merge branches 'development' and 'fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes
 Conflicts:
	lib/models/patient/patiant_info_model.dart
3 years ago
Mohammad Aljammal b4e702f41d Merge branch 'video_stream_fix_bugs' into 'development'
video stream add record icon and change button disable

See merge request Cloud_Solution/doctor_app_flutter!755
3 years ago
Elham Rababah f5b7829e7d fix create create episode on live care 3 years ago
mosazaid ac526e8913 change record icon 3 years ago
mosazaid 1fd9c4f2f2 Merge branch 'development' into video-stream-background
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
3 years ago
mosazaid e1c4721ac1 Merge branch 'development' into video_stream_fix_bugs
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
3 years ago
Elham Rababah 0bc3b84cf8 fix sorting inside inpatient 3 years ago
Mohammad Aljammal a52124eb5d Merge branch 'medical_report_changes' into 'development'
medical report changes

See merge request Cloud_Solution/doctor_app_flutter!754
3 years ago
mosazaid 385820fdce video stream add record icon and change button disable 3 years ago
hussam al-habibeh 07835aaa1b medical report changes 3 years ago
mosazaid c722c9b05a Merge branch 'development' into video-stream-background
# Conflicts:
#	android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt
#	lib/core/service/VideoCallService.dart
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
3 years ago
mosazaid c9d7df01e3 video stream keyboard changing 3 years ago
Mohammad Aljammal db4501bd14 Merge branch 'live_care_issue' into 'development'
Live care issue

See merge request Cloud_Solution/doctor_app_flutter!753
3 years ago
Mohammad Aljammal d879f1da77 fix add prescription issue 3 years ago
Mohammad Aljammal e70eabe68d Fix live care issues and qr code 3 years ago
Mohammad Aljammal e4a7f4e105 Merge branch 'sort_out_patient' into 'development'
first step form sort

See merge request Cloud_Solution/doctor_app_flutter!751
3 years ago
Mohammad Aljammal cfd1912f7d Merge branch 'video_stream_fix_bugs' into 'development'
Video stream fix bugs

See merge request Cloud_Solution/doctor_app_flutter!750
3 years ago
mosazaid 8d5f86e4f2 Merge branch 'development' into video_stream_fix_bugs 3 years ago
mosazaid 321bf7825e solve video stream publisher popup window bug 3 years ago
Mohammad Aljammal b3933c1568 Merge branch 'fix_qr_issues' into 'development'
Fix Qr issues

See merge request Cloud_Solution/doctor_app_flutter!749
3 years ago
Elham Rababah 9da1bff723 first step form sort 3 years ago
Mohammad Aljammal 0e2bcd7916 Fix Qr issues 3 years ago
mosazaid 7fed1c58f3 working to open video stream from service 3 years ago
Mohammad Aljammal 78338ebc64 Merge branch 'video-streaming-android' into 'development'
Merge video call into 'development'

See merge request Cloud_Solution/doctor_app_flutter!745
3 years ago
Mohammad Aljammal 0cb82586bd Merge branch 'fix_inpatent_header' into 'development'
fix header

See merge request Cloud_Solution/doctor_app_flutter!744
3 years ago
Mohammad Aljammal 352d3263ac Merge branch 'special_clinic' into 'development'
add loader

See merge request Cloud_Solution/doctor_app_flutter!743
3 years ago
Mohammad Aljammal f9a989b6fd Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android 3 years ago
Mohammad Aljammal 61c94f85b2 fix the end call 3 years ago
mosazaid c585cbb5be fix timer issue 3 years ago