Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
5 years ago |
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 |
Mohammad Aljammal
|
d9759560c3
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
Conflicts:
lib/config/localized_values.dart
lib/pages/login/login.dart
|
5 years ago |
Mohammad Aljammal
|
02d72fa27c
|
fix issues
|
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
|
3122f2438b
|
fix import dialog
|
5 years ago |
Mohammad Aljammal
|
19f12116c4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
|
5 years ago |
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
5 years ago |
Haroon Amjad
|
b9269f525a
|
hot fixes
|
5 years ago |
Haroon Amjad
|
c67d41701d
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Haroon Amjad
|
5606c88715
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
92e6275162
|
Add Confirm send email dialog
|
5 years ago |
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Mohammad Aljammal
|
b25bdbb6fa
|
fix LiveChatPage Service LabOrderResult MedicineSearch issues
|
5 years ago |
Mohammad Aljammal
|
a2ec01be5d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
Conflicts:
lib/config/localized_values.dart
lib/pages/landing/home_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
2f77592bac
|
fix Prescriptions Service and design issues
|
5 years ago |
Mohammad Aljammal
|
62b923b25e
|
fix send rad report email
|
5 years ago |
Mohammad Aljammal
|
5083080ba3
|
fix vital sign details
|
5 years ago |
haroon amjad
|
d14e7e5223
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
eca2266f7b
|
hot fixing
|
5 years ago |
haroon amjad
|
8d20762050
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
5 years ago |
haroon amjad
|
468bb0356c
|
updates & fixes
|
5 years ago |
Mohammad Aljammal
|
9e8def6584
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Mohammad Aljammal
|
4e2c955b09
|
add missing translation
|
5 years ago |
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
5 years ago |
Mohammad Aljammal
|
ced86de9fe
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
Conflicts:
lib/config/localized_values.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/balance/my_balance_page.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
5 years ago |
haroon amjad
|
f1a8e09a59
|
Added info images description
|
5 years ago |
haroon amjad
|
47b030eb82
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# ios/Flutter/.last_build_id
# lib/config/config.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
haroon amjad
|
7edb0c8009
|
Doctor rating dialog revamped
|
5 years ago |
Mohammad Aljammal
|
3daef6e53f
|
add images info
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
haroon amjad
|
e5feef8a9d
|
Updates & UI Fixes
|
5 years ago |
Mohammad Aljammal
|
b6d2878cf1
|
add Radiology translations and colors
|
5 years ago |
Mohammad Aljammal
|
b504f379de
|
fix lab result translations and colors
|
5 years ago |
haroon amjad
|
d284ceac04
|
advance payment & payment flow issues fixed
|
5 years ago |
Mohammad Aljammal
|
91cada6901
|
fix Advance Payment
|
5 years ago |
Mohammad Aljammal
|
dcbc0de69f
|
fix prescription
|
5 years ago |
Mohammad Aljammal
|
67cc5e2033
|
fix Prescriptions
|
5 years ago |
Zohaib Kambrani
|
8fcf1b6708
|
Swipe the Native loading « arguments
|
5 years ago |
Mohammad Aljammal
|
ddc7eca605
|
fix Insurance Cards
|
5 years ago |
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
5 years ago |
Mohammad Aljmma
|
770d28033d
|
fix issues#26 & 27 & 28
|
5 years ago |
Mohammad Aljmma
|
8f38dc6077
|
fix issue #24
|
5 years ago |
Mohammad Aljmma
|
fdeac4823e
|
fix issue #10
|
5 years ago |
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
5 years ago |
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
5 years ago |