Mohammad Aljammal
|
aa89a05f1d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
haroon amjad
|
a7dc2fdfd1
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
5 years ago |
haroon amjad
|
781fd1c287
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
f38f53587b
|
fix issues
|
5 years ago |
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
5 years ago |
Mohammad Aljammal
|
92e6275162
|
Add Confirm send email dialog
|
5 years ago |
Mohammad Aljammal
|
b25bdbb6fa
|
fix LiveChatPage Service LabOrderResult MedicineSearch issues
|
5 years ago |
Mohammad Aljammal
|
2f77592bac
|
fix Prescriptions Service and design issues
|
5 years ago |
Mohammad Aljammal
|
eca2266f7b
|
hot fixing
|
5 years ago |
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
Mohammad Aljammal
|
dcbc0de69f
|
fix prescription
|
5 years ago |
Mohammad Aljammal
|
67cc5e2033
|
fix Prescriptions
|
5 years ago |
Mohammad Aljmma
|
8f38dc6077
|
fix issue #24
|
5 years ago |
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
5 years ago |
Mohammad Aljmma
|
6a83538544
|
add info for Medical
|
5 years ago |
Elham Rababah
|
5ed4d76a54
|
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
5 years ago |
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
5 years ago |
Mohammad Aljammal
|
9f06ce7d1d
|
done EyeMeasurements service
|
6 years ago |
Mohammad Aljammal
|
1b3a780a29
|
add ar lan for medical profile
|
6 years ago |
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
6 years ago |
Mohammad Aljammal
|
940b327561
|
done Prescriptions
|
6 years ago |
Mohammad Aljammal
|
8de50bfe74
|
medical - my doctor and prescription services and pages
|
6 years ago |