Commit Graph

33 Commits (f52aed49fd124e185ffdfd58bb9bc4d37b52bc31)

Author SHA1 Message Date
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 4ac11b2169 LanguageID Fixes 2 years ago
Sultan khan 62dc3c162a updated 3.13.6 2 years ago
devamirsaleemahmad ed748a626b changes 2 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 2 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad 3db4094585 Ereferral fixed, HHC moved to new APIs, Notification new design implemented 4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 03882c166c Translation & UI updates 4 years ago
haroon amjad 90843252c3 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
#	lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique e1b79ef5c1 E-Refreal design 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
haroon amjad 85d68b0388 ereferral fixes 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
4 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
Elham Rababh bb372210e0 PAP-938: fix Referral sent 5 years ago
Elham Rababh bff7020b78 PAP-939: fixes 5 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
5 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 5 years ago
Sikander Saleem 889ae24f07 merge changes-3 5 years ago
Elham Rababh dd1dff01d6 PAP-790: fix Alignment of mobile number 5 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago
haroon amjad dfa7e0e02f updates & fixes 5 years ago
Elham Rababah dd76ae05a7 fix H2O page issue 5 years ago
Elham Rababah 37d9eae9ea improve E-referral 5 years ago
Elham Rababah a00bc8268e improve E-referral 6 years ago
Elham Rababah ae147b5988 first step from search referrals 6 years ago
Elham Rababah 1e3ff89dbd finish new e-referral except calling the service 6 years ago
Elham Rababah f582eee991 make index page of add new referral as page controller 6 years ago