Commit Graph

2916 Commits (cc26053bc186c8ff0b3ba463df875331f0cc9878)
 

Author SHA1 Message Date
mosazaid 61b0f6c22c Merge branch 'development' into video-streaming-android 5 years ago
mosazaid 6fca263109 video_streaming draggable popup 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
Mohammad Aljammal 0bfc63bddc Merge branch 'referral_reply' into 'development'
Referrel Doctor reply

See merge request Cloud_Solution/doctor_app_flutter!736
5 years ago
Elham Rababah 712a742aa2 fix small issue 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
mosazaid 96f2de2c35 Merge branch 'development' into video-streaming-android 5 years ago
Elham Rababah 3fefcf60d7 match the app header design 5 years ago
Mohammad Aljammal e77f5773dc Merge branch 'video_screen_re-design' into 'development'
change video streaming design

See merge request Cloud_Solution/doctor_app_flutter!733
5 years ago
Elham Rababah 132565c298 Merge branches 'development' and 'headers_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor 5 years ago
Zohaib Iqbal Kambrani 63526113f4 no message 5 years ago
Mohammad Aljammal d2e0555144 Merge branch 'fix_medical_report' into 'development'
Fix medical report

See merge request Cloud_Solution/doctor_app_flutter!734
5 years ago
Elham Rababah b0938562fa Merge branches 'development' and 'fix_medical_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_medical_report
 Conflicts:
	pubspec.lock
5 years ago
Mohammad Aljammal fb28b7e910 Merge branch 'reply-doctor_changes' into 'development'
reply changes

See merge request Cloud_Solution/doctor_app_flutter!735
5 years ago
mosazaid c44b3d74bb reply changes 5 years ago
Mohammad Aljammal 726d3ab885 Fix video call issue android 5 years ago
Elham Rababah 30bf59458c finish medical report 5 years ago
Mohammad Aljammal a74f4a3d5a Merge branch 'reply-doctor_changes' into 'development'
Merge branch 'development' into procedure_refactoring

See merge request Cloud_Solution/doctor_app_flutter!732
5 years ago
mosazaid 1834d9f776 change video streaming design 5 years ago
Elham Rababah e530dc0168 first step from fix medical report 5 years ago
Elham Rababah 717468b637 fix design issue 5 years ago
Elham Rababah 57399c3dcb fix issues in header 5 years ago
Elham Rababah 95425d9568 fix issues in header 5 years ago
Elham Rababah 6aef8b5878 first step refactor headers 5 years ago
Zohaib Iqbal Kambrani 42a4f9330a no message 5 years ago
mosazaid 1c80533e67 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into reply-doctor_changes 5 years ago
mosazaid 017669c406 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
Elham Rababah 354a1f2dec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes 5 years ago
Elham Rababah ca0cc745d5 remove headers 5 years ago
Mohammad Aljammal ad773c5e56 Merge branch 'reply-doctor_changes' into 'development'
Reply doctor changes

See merge request Cloud_Solution/doctor_app_flutter!731
5 years ago
Elham Rababah 0e513ecca8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes 5 years ago
Elham Rababah 23feb2c354 remove unused code 5 years ago
mosazaid 1b47b60155 Merge branch 'development' into reply-doctor_changes
# Conflicts:
#	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
5 years ago
mosazaid 10441e4af0 referral changes 5 years ago
Mohammad Aljammal 228df1e762 Merge branch 'end_call_fixes' into 'development'
fix font size in header

See merge request Cloud_Solution/doctor_app_flutter!730
5 years ago
Elham Rababah 4cdc654348 fix font size in header 5 years ago
Mohammad Aljammal 418918558f Merge branch 'end_call_fixes' into 'development'
End call fixes

See merge request Cloud_Solution/doctor_app_flutter!729
5 years ago
Mohammad Aljammal a0c7f7321d Merge branch 'fix_label_replay_on_referral' into 'development'
fix label on replay referral

See merge request Cloud_Solution/doctor_app_flutter!728
5 years ago
Zohaib Iqbal Kambrani 1a158f49bb no message 5 years ago
Elham Rababah cb5abfb2ec remove comment code 5 years ago
Elham Rababah 36caca0e46 test live care and general result header in lab result 5 years ago
Mohammad Aljammal 0b52b4009d fix label on replay referral 5 years ago
mosazaid e76ecf172f video-straming-android-changes 5 years ago
Elham Rababah 176c0ab97c first step from live care fixes 5 years ago
Zohaib Iqbal Kambrani 693f57a13e Merge branch 'development' into ZohaibKambrani
* development: (102 commits)
  prescription changes
  pescription changes
  fix imports
  project refactoring
  working on feature medical profile
  prescription changes
  hot fix
  hot fix
  hot fix
  refactoring
  hot fix
  hot fix
  add prescription form changes
  Add Medical Report Page
  hot fix
  hot fix
  add prescription changes
  fix in note and AddReplayOnReferralPatient
  Add Prescription changes
  prescription changes
  ...

# Conflicts:
#	lib/screens/patients/DischargedPatientPage.dart
#	lib/screens/patients/ReferralDischargedPatientDetails.dart
#	lib/screens/patients/insurance_approvals_details.dart
#	lib/screens/patients/patients_screen.dart
#	lib/screens/patients/profile/note/progress_note_screen.dart
#	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
#	lib/screens/prescription/update_prescription_form.dart
#	lib/screens/sick-leave/add-sickleave.dart
#	lib/widgets/patients/PatientCard.dart
#	pubspec.lock
5 years ago