Commit Graph

247 Commits (aa89a05f1d8bcfe18e7a4cf14fcb6f8727573019)

Author SHA1 Message Date
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
4 years ago
Mohammad Aljammal b29fdbb7d0 fix home issues 4 years ago
Mohammad Aljammal 02d72fa27c fix issues 4 years ago
Mohammad Aljammal f38f53587b fix issues 4 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 4 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 4 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 4 years ago
Haroon Amjad 5606c88715 hot fixes 4 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 4 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 4 years ago
Zohaib Kambrani 8457972fda no message 4 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 4 years ago
Zohaib Kambrani 92ba977fca no message 4 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 4 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
4 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 4 years ago
Mohammad Aljammal 62b923b25e fix send rad report email 4 years ago
Mohammad Aljammal 9cec304712 Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes

See merge request Cloud_Solution/diplomatic-quarter!168
4 years ago
Sultan Khan 21ccf1ef86 bug fixes 4 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 4 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 4 years ago
Sultan Khan f5b7d35f23 bug fixes 4 years ago
Sultan Khan 81c8239412 bug fixes 4 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
4 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 4 years ago
Mohammad Aljammal 3daef6e53f add images info 4 years ago
Zohaib Kambrani 1155466d19 Packages and Offer Slider at home 4 years ago
Sultan Khan de2a5e55eb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 4 years ago
Sultan Khan 648d9d245d health weather indicator 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Sultan Khan 340b9770c8 login 4 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 4 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 4 years ago
Sultan Khan 391e178484 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 8d499704dc family file changes 4 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 4 years ago
Mohammad Aljammal dcbc0de69f fix prescription 4 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 4 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
4 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 4 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 4 years ago
Mohammad Aljmma 6523a1dea9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 4 years ago
Zohaib Kambrani 69d1e4bb0b no message 4 years ago
Sultan Khan 3589b21590 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago