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 |
Mohammad Aljammal
|
f1d1cc6243
|
Merge branch 'navigation_service' into 'development'
add NavigationService
See merge request Cloud_Solution/doctor_app_flutter!727
|
5 years ago |
Elham Rababah
|
b1062dd537
|
fix merge issue
|
5 years ago |
Elham Rababah
|
2e0f6aad5c
|
Merge branches 'development' and 'navigation_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into navigation_service
Conflicts:
lib/locator.dart
|
5 years ago |
Mohammad Aljammal
|
b779450b62
|
Merge branch 'referral-outpatient' into 'development'
Merge branch 'development' into procedure_refactoring
See merge request Cloud_Solution/doctor_app_flutter!726
|
5 years ago |
Elham Rababah
|
9d6a23c1a3
|
add NavigationService
|
5 years ago |
Elham Rababah
|
3df6a55dad
|
remove comment
|
5 years ago |
Elham Rababah
|
72966c3269
|
fix referral patient services
|
5 years ago |
mosazaid
|
663c8d1104
|
Merge branch 'development' into referral-outpatient
|
5 years ago |
Mohammad Aljammal
|
95b00dd67d
|
Merge branch 'fix_live_care' into 'development'
fix live care issues
See merge request Cloud_Solution/doctor_app_flutter!725
|
5 years ago |
Mohammad Aljammal
|
f6922ee41a
|
Merge branch 'live_care_fixes' into 'development'
Live care fixes
See merge request Cloud_Solution/doctor_app_flutter!724
|
5 years ago |
Mohammad Aljammal
|
77be588614
|
Merge branch 'procedure_refactoring' into 'development'
livecare
See merge request Cloud_Solution/doctor_app_flutter!722
|
5 years ago |
Elham Rababah
|
8a8b55d2de
|
move show timer to its own file
|
5 years ago |
Elham Rababah
|
792c85e28a
|
fix live care icon size
|
5 years ago |
Mohammad Aljammal
|
a1abcaa7c0
|
fix live care issues
|
5 years ago |
mosazaid
|
ec9f628b67
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/service/patient/LiveCarePatientServices.dart
|
5 years ago |
Elham Rababah
|
f80215b6bb
|
fix doctor id spelling in live care service, fix colors in
|
5 years ago |