Commit Graph

3452 Commits (66a9afa6f304bcc5b2ca45b72fe44accd89b7d75)
 

Author SHA1 Message Date
haroon amjad 6e558bf5a6 Splash fix 2 years ago
Sultan khan 90dc8e5e05 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/models/LiveCare/ApplePayInsertRequest.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/uitl/location_util.dart
#	pubspec.yaml
2 years ago
Faiz Hashmi a494f454cb Andesfit WeightScale InProgress 2 years ago
haroon amjad 32757c85f8 updates 2 years ago
haroon amjad 180cc43705 Update to stores 2 years ago
haroon amjad cb79d625d1 Update to stores for LiveCare fix 2 years ago
haroon amjad 30b57ff5f0 updates 2 years ago
haroon amjad ccdf410995 Update to stores 2 years ago
haroon amjad 9043e3c687 Apple Pay Updates 2 years ago
haroon amjad e28805f70f updates 2 years ago
haroon amjad b4138b2066 Show Date check added in DoctorView 2 years ago
haroon amjad c65d668c92 updates 2 years ago
haroon amjad 3792a67ae7 updates 2 years ago
haroon amjad 7850748ea2 Dental updates 2 years ago
Sultan khan 30c14c2167 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	lib/core/model/reports/Reports.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/medical/ask_doctor_view_model.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/PrescriptionReport.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/medical/eye/EyeHomePage.dart
#	lib/pages/medical/reports/report_list_widget.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/location_util.dart
#	lib/uitl/utils.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad 0168f06bb9 updates 2 years ago
Faiz Hashmi 4893a1f3af Merge remote-tracking branch 'origin/dev_3.3_BLE' into dev_3.3_BLE 2 years ago
Faiz Hashmi 43f149d940 Added ER1 Without fileList 2 years ago
haroon amjad 5dc0f571c8 Updates 2 years ago
haroon amjad c73333d164 BP Device implemented 2 years ago
haroon amjad 1b0961a08f location timeout 2 years ago
haroon amjad c29e2c88f0 location timeout handled in online check-in via location 2 years ago
haroon amjad eb1bddf772 updates 2 years ago
Faiz Hashmi 1cc77e7d32 Completed the available ECG devices 2 years ago
haroon amjad f1a74749f7 param update 2 years ago
haroon amjad bbc42bd1e7 updates 2 years ago
haroon amjad d3bdcfa975 Apple Pay code merged into main branch 2 years ago
haroon amjad 48202ffd12 updates 2 years ago
Faiz Hashmi 8611903db0 Merge remote-tracking branch 'origin/dev_3.3_BLE' into dev_3.3_BLE 2 years ago
Faiz Hashmi 70ca4071fc Completed the oxymeter category 2 years ago
haroon amjad bea15150aa Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
haroon amjad ec0bed04d3 Apple Pay in production implemented & tested 2 years ago
haroon amjad fe7c2c6873 CR 6631 2 years ago
haroon amjad a271e700c7 Updates 2 years ago
haroon amjad 33b0900b37 SP-20 device integrated with iOS 2 years ago
haroon amjad be53844c58 DuoEK ECG iOS Integration done 2 years ago
haroon amjad c9994b8269 iOS ECG implementation 2 years ago
Faiz Hashmi 0a700270f4 Oxymeter integration completed 2 years ago
haroon amjad ac52ba75a7 Updates & Fixes 2 years ago
Faiz Hashmi c3ce151a79 Merge branch 'dev_3.3_BLE' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_3.3_BLE
# Conflicts:
#	lib/viatom_ble/ble_connect.dart
2 years ago
Faiz Hashmi 6e97f8556f BP tracker Integration Completed 2 years ago
haroon amjad 6aea29e06a ECG iOS Updates 2 years ago
haroon amjad 98a5b7d049 my appointments fixes 2 years ago
haroon amjad 83b681981d updates 2 years ago
haroon amjad 27ed5c95f2 update to stores 2 years ago
haroon amjad 7e49dac7bd Updates 2 years ago
haroon amjad 886677d97e EKG iOS Integration 2 years ago
haroon amjad 3d1d61066f EKG iOS Integration in progress 2 years ago
Faiz Hashmi 7d023cdb35 BP tracker Integration in Progress 2 years ago
haroon amjad e67bd54c04 updates 2 years ago