Commit Graph

10 Commits (42feae9a2e3727468f8f5373cb137c4764a2b81a)

Author SHA1 Message Date
Mohammad Aljammal ee7f8e9e42 Merge branch 'videocall_popup' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-streaming-android 3 years ago
Zohaib Iqbal Kambrani c1de908777 no message 3 years ago
Zohaib Iqbal Kambrani 48874c0efd no message 3 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
3 years ago
Zohaib Iqbal Kambrani f60ff85e31 no message 3 years ago
Zohaib Iqbal Kambrani 1b4988e5f0 no message 3 years ago
Zohaib Iqbal Kambrani 63526113f4 no message 3 years ago
Zohaib Iqbal Kambrani 42a4f9330a no message 3 years ago
Zohaib Iqbal Kambrani 1a158f49bb no message 3 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
3 years ago