You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
HMG_Patient_App/lib/pages
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
..
AlHabibMedicalService Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Blood models updates -> 3.13.6 2 years ago
BookAppointment Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
ChildVaccines updated 3.13.6 2 years ago
ContactUs models updates -> 3.13.6 2 years ago
Covid-DriveThru updates. 2 years ago
DrawerPages Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
ErService Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
InPatientServices Inpatient Cr Merge 2 years ago
MyAppointments Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
ToDoList Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
appUpdatePage changes & Null to Dynamic 2 years ago
base models updates -> 3.13.6 2 years ago
conference Changes into Rating Bar 2 years ago
feedback Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
insurance Inpatient Cr Merge 2 years ago
landing Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
livecare Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
login Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
medical Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
packages_offers Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
paymentService Inpatient Cr Merge 2 years ago
pharmacies Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
pharmacy Changes into Rating Bar 2 years ago
rateAppointment Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
settings update in progress 2 years ago
symptom-checker update in progress 2 years ago
vaccine changes & Null to Dynamic 2 years ago
videocall-webrtc-rnd Changes into Rating Bar 2 years ago
weather-indicator sultan 5 years ago
webRTC Changes into Rating Bar 2 years ago
TestPage.dart changes 2 years ago
final_products_page.dart Changes into Rating Bar 2 years ago
offers_categorise_page.dart Changes into Rating Bar 2 years ago
parent_categorise_page.dart Changes into Rating Bar 2 years ago
pharmacy_categorise.dart changes 2 years ago
search_products_page.dart changes 2 years ago
sub_categories_modalsheet.dart changes 2 years ago
sub_categorise_page.dart Changes into Rating Bar 2 years ago