Commit Graph

865 Commits (1bb40ddeb97b8dcdfc4e66c028a7226a3a7439f0)

Author SHA1 Message Date
mosazaid 1bb40ddeb9 Merge branch 'development' into video-stream-background 5 years ago
mosazaid 783c74108b video isRecord change 5 years ago
Mohammad Aljammal ec3ac18a15 Merge branch 'video-stream-background' into 'development'
Video stream background

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

See merge request Cloud_Solution/doctor_app_flutter!757
5 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
5 years ago
mosazaid a7c5e1afde finish solve keybaord issue 5 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
5 years ago
Elham Rababah 29eeb21e76 finalize create episode on Live care. 5 years ago
hussam al-habibeh 19548ccb1e Medical Report change status 5 years ago
Elham Rababah 80ef1a241d first step from fix episode in patient live care list 5 years ago
hussam al-habibeh bec5eb82bc update medical file service 5 years ago
hussam al-habibeh c652f40a89 add medical report new service 5 years ago
Mohammad Aljammal a5988c2885 Merge branch 'fixes' into 'development'
Fixes

See merge request Cloud_Solution/doctor_app_flutter!756
5 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
5 years ago
mosazaid 1fd9c4f2f2 Merge branch 'development' into video-stream-background
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
mosazaid e1c4721ac1 Merge branch 'development' into video_stream_fix_bugs
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Elham Rababah 0bc3b84cf8 fix sorting inside inpatient 5 years ago
mosazaid 385820fdce video stream add record icon and change button disable 5 years ago
hussam al-habibeh 07835aaa1b medical report changes 5 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
5 years ago
Mohammad Aljammal e70eabe68d Fix live care issues and qr code 5 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
5 years ago
mosazaid 321bf7825e solve video stream publisher popup window bug 5 years ago
Elham Rababah 9da1bff723 first step form sort 5 years ago
mosazaid 7fed1c58f3 working to open video stream from service 5 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
5 years ago
Mohammad Aljammal 0cb82586bd Merge branch 'fix_inpatent_header' into 'development'
fix header

See merge request Cloud_Solution/doctor_app_flutter!744
5 years ago
Mohammad Aljammal f9a989b6fd Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android 5 years ago
Mohammad Aljammal 61c94f85b2 fix the end call 5 years ago
mosazaid 02f43d6e61 fix timer issue 5 years ago
Mohammad Aljammal 654a86a9b6 Add App Permissions Utils 5 years ago
Mohammad Aljammal bed7dee27c fix drop video call issue 5 years ago
Elham Rababah 78903043d9 fix header 5 years ago
Mohammad Aljammal 7614b4aa5c fix the video call issues 5 years ago
Mohammad Aljammal 746f44157e Add video call service 5 years ago
Elham Rababah c1ed1dc737 add loader 5 years ago
mosazaid 550b4a848d Merge branch 'development' into video-streaming-android 5 years ago
mosazaid 883778d278 video call 5 years ago
Elham Rababah 37e6853976 add special one first calling 5 years ago
Elham Rababah 7f3ae19fd2 remove todo 5 years ago
Elham Rababah 7b71bd752f add to do 5 years ago
Elham Rababah 363b55069f first step form Special Clinic 5 years ago
mosazaid 13ee7f6491 Merge branch 'videocall_popup' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-streaming-android
 Conflicts:
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/util/VideoChannel.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
5 years ago
Zohaib Iqbal Kambrani f60ff85e31 no message 5 years ago
Mohammad Aljammal 01a49ae200 Merge branch 'headers_refactor' into 'development'
Headers refactor

See merge request Cloud_Solution/doctor_app_flutter!737
5 years ago
Elham Rababah 161cb1e872 fix profile height size 5 years ago
hussam al-habibeh 142fbb93fd Referrel Doctor reply 5 years ago
Elham Rababah 411746da98 remove patient type and arrival type form patient profile header 5 years ago
Zohaib Iqbal Kambrani 1b4988e5f0 no message 5 years ago
Elham Rababah bc53ca7b8a fix appointment date in header 5 years ago