taha.alam
|
7486f320dc
|
king khalid university application
|
1 year ago |
 haroon amjad
|
ed037edf22
|
Apple Pay fixes
|
1 year ago |
|
haroon amjad
|
31aa09e35b
|
translation fix
|
1 year ago |
|
haroon amjad
|
52e63fe5e4
|
Update to stores 15.9
|
1 year ago |
|
haroon amjad
|
d0e743dcc9
|
Family members issue fixed in android
|
1 year ago |
|
haroon amjad
|
8edf65daf1
|
Updates & Fixes
|
1 year ago |
|
haroon amjad
|
c948a1780c
|
Update to stores VersionID 15.8
|
1 year ago |
|
haroon amjad
|
5b7b40c732
|
Updates & fixes
|
1 year ago |
|
haroon amjad
|
c97fd25cdd
|
Zoom integration updates & other stability fixes
|
1 year ago |
Aamir.Muhammad
|
d9cf383648
|
Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/reports/report_home_page.dart
|
1 year ago |
|
haroon amjad
|
3a65113149
|
Update to stores 15.7
|
1 year ago |
|
Aamir.Muhammad
|
8441a0ef00
|
Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/pages/login/login.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/services/clinic_services/get_clinic_service.dart
# lib/uitl/utils.dart
# lib/widgets/dialogs/radio_selection_dialog.dart
|
1 year ago |
|
haroon amjad
|
96d5c3ce1d
|
My Instructions added
|
1 year ago |
|
haroon amjad
|
6e30df2a29
|
WeCare service added
|
1 year ago |
|
haroon amjad
|
4c0d758dd1
|
Zoom updates
|
1 year ago |
|
Sultan khan
|
d1b13d5ce9
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
|
haroon amjad
|
a4a638aa37
|
updates
|
2 years ago |
|
Sultan khan
|
c9be715436
|
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/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
|
2 years ago |
|
haroon amjad
|
69e64fd5fb
|
Blood Donation CR merged into dev_3.3
|
2 years ago |
|
haroon amjad
|
f8e7ccf73f
|
updates
|
2 years ago |
 Aamir Muhammad
|
52a5e978a7
|
changes local
|
2 years ago |
|
Sultan khan
|
5e9d08b9aa
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
|
2 years ago |
|
Sultan khan
|
08b4c8f86e
|
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
# lib/config/config.dart
# lib/core/viewModels/project_view_model.dart
# lib/main.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/LiveCareHistoryCard.dart
# lib/pages/medical/eye/ContactLensPage.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/widgets/Loader/gif_loader_container.dart
# lib/widgets/data_display/medical/time_line_new_widget.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
|
haroon amjad
|
968e59707e
|
updates
|
2 years ago |
|
haroon amjad
|
d6dacfb743
|
Load more added in appointments timeline.
|
2 years ago |
|
haroon amjad
|
5256d8873f
|
ToDo & Appo Timeline changes
|
2 years ago |
|
Sultan khan
|
eee2ccf148
|
updates
|
2 years ago |
|
haroon amjad
|
727a9f1363
|
updates & checks
|
2 years ago |
|
haroon amjad
|
7fc47ebf34
|
LiveCare invoice fix
|
2 years ago |
|
haroon amjad
|
162b2fd22a
|
updates
|
2 years ago |
|
haroon amjad
|
b42c47f074
|
Update to stores
|
2 years ago |
|
Sultan khan
|
0e04012219
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/services/clinic_services/get_clinic_service.dart
|
2 years ago |
|
Sultan khan
|
a4ed832147
|
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/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/pages/ErService/OrderLogPage.dart
# lib/pages/ErService/rapid-response-team/rrt-request-page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/payfort_services/payfort_service.dart
# lib/services/payfort_services/payfort_view_model.dart
# lib/splashPage.dart
# pubspec.yaml
|
2 years ago |
|
haroon amjad
|
e0ae8d7c8e
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
357f0f8c24
|
updates
|
2 years ago |
|
haroon amjad
|
a12558076f
|
Merge branch 'development_v3.3' into dev_3.3_AmbulanceRequestCR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
|
Sultan khan
|
6983e309e0
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# android/build.gradle
# android/gradle.properties
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/model/prescriptions/prescription_report_inp.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.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/services/clinic_services/get_clinic_service.dart
# pubspec.yaml
|
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 |
|
haroon amjad
|
180cc43705
|
Update to stores
|
2 years ago |
|
haroon amjad
|
cb79d625d1
|
Update to stores for LiveCare fix
|
2 years ago |
|
haroon amjad
|
c65d668c92
|
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
|
c29e2c88f0
|
location timeout handled in online check-in via location
|
2 years ago |
|
haroon amjad
|
eb1bddf772
|
updates
|
2 years ago |
|
haroon amjad
|
d3bdcfa975
|
Apple Pay code merged into main branch
|
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
|
ac52ba75a7
|
Updates & Fixes
|
2 years ago |
|
haroon amjad
|
27ed5c95f2
|
update to stores
|
2 years ago |