Commit Graph

59 Commits (5e8fe20f522703cc69d17a939870dd3a7c08876e)

Author SHA1 Message Date
haroon amjad 5e8fe20f52 updates 1 year ago
Aamir.Muhammad 4c5ba6048f CR Fixes Search By Clinic & Search By Doctor List Reload Issue 1 year ago
haroon amjad 8edf65daf1 Updates & Fixes 1 year ago
haroon amjad 5b7b40c732 Updates & fixes 1 year ago
Sultan khan 735582e3ab updated code. 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
haroon amjad b4138b2066 Show Date check added in DoctorView 2 years ago
haroon amjad 7850748ea2 Dental updates 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 4ac11b2169 LanguageID Fixes 2 years ago
Sultan khan 8c520d9431 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/DoctorView.dart
2 years ago
Sultan khan 432e64e51d updates 2 years ago
Aamir Muhammad b4bc99369f Changes into Rating Bar 2 years ago
Sultan khan 1a5687a27c Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/uitl/app_toast.dart
2 years ago
Sultan khan ec13edc28b updates. 2 years ago
devamirsaleemahmad 8f591654a5 changes 2 years ago
devamirsaleemahmad c1fd6313b1 changes 2 years ago
devamirsaleemahmad b26f535749 models updates -> 3.13.6 2 years ago
haroon amjad e5e5bb5352 Dental book appointment changes 3 years ago
haroon amjad 4b4ac4819f no message 4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 4 years ago
haroon amjad 70304427f9 Doc specialty fix 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 4 years ago
haroon amjad 503ab739ca prescription availability design revamped 4 years ago
Sikander Saleem 6099738a5c improvements 4 years ago
haroon amjad f795ba24c5 updates & fixes 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 4 years ago
Sikander Saleem 62ca009404 improvement. 4 years ago
Mirza.Shafique ebf293736d Booking appointment Marge 4 years ago
Sikander Saleem 8367fc09f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
4 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 4 years ago
Sikander Saleem 970887b0c5 changes 4 years ago
Sikander Saleem 350ff20a1a my doctor screen. 4 years ago
haroon amjad a32501f3dc My invoices implementation continued 4 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
haroon amjad dde10cd27b working in LiveCare Scheduling 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
Mohammad Aljammal 84bb68789d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
 Conflicts:
	lib/config/config.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/ContactUs/findus/hospitrals_page.dart
	lib/pages/ContactUs/findus/pharmacies_page.dart
5 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Mohammad Aljammal 68466c8d03 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/models/Appointments/DoctorListResponse.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
5 years ago
haroon amjad ce9903fd13 nearest appointment flow implemented 5 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 5 years ago
haroon amjad f669adcb9d Location service implemented 5 years ago
haroon amjad 84e92cb040 updates & fixes 5 years ago