haroon amjad
|
37aa700b2e
|
fixes
|
2 years ago |
haroon amjad
|
e5d8505c2d
|
Updates & fixes
|
2 years ago |
Sultan khan
|
4b28581c55
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/models/Appointments/toDoCountProviderModel.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/login/login.dart
# lib/services/authentication/auth_provider.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
2 years ago |
haroon amjad
|
75bfeaa716
|
My appointment fixes
|
2 years ago |
haroon amjad
|
27b6e04d33
|
updates
|
2 years ago |
haroon amjad
|
3401496739
|
Updates & fixes
|
2 years ago |
Sultan khan
|
86f5e81fea
|
merge with 3.3
|
2 years ago |
Sultan khan
|
d0c7b08eac
|
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/service/client/base_app_client.dart
lib/core/viewModels/er/EdOnlineViewModel.dart
lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
lib/pages/BookAppointment/DentalComplaints.dart
lib/pages/BookAppointment/components/SearchByClinic.dart
lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/landing/landing_page.dart
lib/pages/livecare/widgets/clinic_card.dart
lib/pages/login/login.dart
lib/pages/rateAppointment/rate_appointment_clinic.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/services/clinic_services/get_clinic_service.dart
lib/uitl/push-notification-handler.dart
lib/widgets/others/bottom_bar.dart
pubspec.yaml
|
2 years ago |
haroon amjad
|
fddb423451
|
Updates & fixes
|
2 years ago |
haroon amjad
|
aa04e943ef
|
updates & fixes
|
2 years ago |
Sultan khan
|
98a2545a9b
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
# lib/config/config.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/uitl/push-notification-handler.dart
|
2 years ago |
Sultan khan
|
c1fbce7eae
|
bug fixes
|
2 years ago |
haroon amjad
|
cfa341aba5
|
Apple Pay Updates
|
2 years ago |
haroon amjad
|
4ac11b2169
|
LanguageID Fixes
|
2 years ago |
haroon amjad
|
e4ce158277
|
updates
|
2 years ago |
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
|
52b3c196d6
|
updates
|
2 years ago |
Faiz Hashmi
|
704c0bbbc6
|
Merge branch 'development_v3.3' into dev_3.3_faiz_payfort
|
2 years ago |
Faiz Hashmi
|
fe665fd5ae
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
# pubspec.yaml
|
2 years ago |
haroon amjad
|
512db615be
|
Language ID fixes & app update to stores, VersionID 11.5
|
2 years ago |
Faiz Hashmi
|
ccb9e93d62
|
Added InAppApple Pay with PayFort
|
2 years ago |
haroon amjad
|
2008ccf92c
|
updates
|
2 years ago |
Faiz Hashmi
|
b769959823
|
Revert "changes to build app"
This reverts commit 1492efde
|
2 years ago |
Faiz Hashmi
|
0e67851646
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
|
2 years ago |
haroon amjad
|
f7dffea2eb
|
Language ID fixes
|
2 years ago |
haroon amjad
|
724a26ca68
|
Updates
|
2 years ago |
haroon amjad
|
a9d4cb2fd8
|
InApp Browser Update
|
2 years ago |
haroon amjad
|
bcfeff2661
|
updates
|
2 years ago |
haroon amjad
|
cfd8b5e8a5
|
Language ID Changes
|
2 years ago |
haroon amjad
|
264aed70a0
|
NFC Check added
|
2 years ago |
Faiz Hashmi
|
d3b4f37c73
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
# pubspec.yaml
|
2 years ago |
haroon amjad
|
165f3fb9f6
|
NFC Check removed for appo checkin
|
2 years ago |
haroon amjad
|
47779f6fa7
|
last appointment rating fixed
|
2 years ago |
haroon amjad
|
faf3bbdd9e
|
Unit column position changed
|
2 years ago |
haroon amjad
|
01db5408c9
|
fixes
|
2 years ago |
haroon amjad
|
80167378d9
|
lat long fixes
|
2 years ago |
haroon amjad
|
eef6f78fd6
|
Updates
|
2 years ago |
haroon amjad
|
c6c4f933b2
|
Invoice Type param added in Labs & Rad
|
2 years ago |
haroon amjad
|
0a9aee0246
|
updates
|
2 years ago |
haroon amjad
|
421bae2037
|
updates
|
2 years ago |
Sultan khan
|
f2a57255fc
|
no message
|
2 years ago |
haroon amjad
|
8b468fe4b5
|
Updates & fixes
|
2 years ago |
Sultan khan
|
6a74cdd2da
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
Sultan khan
|
70077c97db
|
local auth change
|
2 years ago |
Aamir Muhammad
|
6f99aca8a5
|
Inpatient Cr Merge
|
2 years ago |
Aamir Muhammad
|
77651f9652
|
Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/project_view_model.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/login/confirm-login.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/push-notification-handler.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/uitl/utils_new.dart
# lib/widgets/avatar/large_avatar.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/bottom_options/BottomSheet.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
Aamir Muhammad
|
22b48aef92
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
haroon amjad
|
70176e0cb1
|
updates
|
2 years ago |
Sultan khan
|
359a177797
|
updates
|
2 years ago |
haroon amjad
|
beb3453ff5
|
updates
|
2 years ago |