Commit Graph

26 Commits (4338da513ddae769c3cfb88b2c473dc4dcf529d2)

Author SHA1 Message Date
Sultan khan 4338da513d Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/core/model/labs/request_patient_lab_special_result.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/model/rate/appoitment_rated.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/service/medical/radiology_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/models/Authentication/check_activation_code_request.dart
#	lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/splashPage.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad 512db615be Language ID fixes & app update to stores, VersionID 11.5 2 years ago
Aamir Muhammad 7f890bb24a Changes 2 years ago
Sultan khan c63a1fadf5 code updated in-progress 2 years ago
haroon amjad 1a45dd57e9 LiveCare Fix 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
haroon amjad a20d6c7c28 Livecare updates 3 years ago
haroon amjad 22274ebbb0 updates & fixes 3 years ago
haroon amjad 52070c8f94 Updates & fixes 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 4 years ago
haroon amjad 833818e6e3 Rad & Lab email issues fixes 4 years ago
haroon amjad b756bf8caf Updates 4 years ago
haroon amjad 11529c65c5 updates 4 years ago
haroon amjad 9057a96d7f Updates & fixes 4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
haroon amjad 60a44f9a42 OpenTok fixes 4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad 57ea450662 LiveCare Schedule fixes 4 years ago
haroon amjad 853ca033d2 LiveCare Schedule API fix 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
haroon amjad b89c1f03b3 language translation fixes 5 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 5 years ago
haroon amjad db30fbdfd2 implementing livecare 6 years ago