Commit Graph

17 Commits (90dc8e5e05530f8496ace08d32dceb585ea7bacb)

Author SHA1 Message Date
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 e5d8505c2d Updates & fixes 2 years ago
devamirsaleemahmad 2c9e51aef0 changes 2 years ago
devamirsaleemahmad 1c19b36d2d models updates -> 3.13.6 2 years ago
haroon amjad 4ba37d342c RRT Updates 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
haroon amjad 1fff2dad25 Smartwatch updates 4 years ago
haroon amjad 259581c4f8 updates & fixes 4 years ago
Sultan Khan 76e16594ba FAMILY FILES 4 years ago
haroon amjad f6d779431a fixes 4 years ago
Sultan Khan 5b988dff4f BUG FIXES 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
haroon amjad 92bfe27a6e updates & fixes 4 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 5 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 5 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 5 years ago