Commit Graph

3384 Commits (dev_v3.13.6)
 

Author SHA1 Message Date
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
Aamir Muhammad b450091457 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 f2079d4bbd payment fix 2 years ago
Aamir Muhammad 0a9d3e2b4d 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 557a3baafe theme change 2 years ago
Aamir Muhammad 881b1fba53 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Aamir Muhammad e914925181 Calender Permission 2 years ago
haroon amjad ded6e02663 CheckIn By Param added 2 years ago
devamirsaleemahmad 6671dea8d8 Delete Event on Calender 2 years ago
haroon amjad a0bca92195 CR Implemented 2 years ago
Sultan khan f534ee6f58 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/reminder_dialog.dart
2 years ago
Sultan khan 62dc3c162a updated 3.13.6 2 years ago
devamirsaleemahmad 2def9f3744 Merges From 3.3 2 years ago
devamirsaleemahmad d73cc13100 Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
2 years ago
devamirsaleemahmad fb62ce2f19 Calender Fix Ios 17+ 2 years ago
devamirsaleemahmad 1ddac14efb Calender Permission Fix Ios 17+ 2 years ago
Aamir Muhammad a24afd4302 Calender Permission 2 years ago
Aamir Muhammad f211fd5617 Call Notification Fix 2 years ago
haroon amjad cb9ced27c2 updates 2 years ago
haroon amjad 1ecb8ebfe9 updated to stores version 11.3 2 years ago
Aamir Muhammad 542864c89c Gif Loader & My Family Fixes 2 years ago
haroon amjad f8fb336740 Location checkin privilege applied 2 years ago
Sultan khan d459600f22 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 5cca651963 no message 2 years ago
Aamir Muhammad 75b969b265 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Aamir Muhammad 7f890bb24a Changes 2 years ago
Sultan khan 8c46d2577d updated with assets 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
haroon amjad 245716119e Location based Check In implemented 2 years ago
haroon amjad 6dd5fda997 Location check in implementing 2 years ago
haroon amjad 5c8bb241b3 Next Actions handled when navigating from My Appointments to ToDo list 2 years ago
devamirsaleemahmad 8bdcfcb764 Changes & Latest Merges 3.3 2 years ago
devamirsaleemahmad 0e8c1a8b2f Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/ToDoList/widgets/paymentDialog.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	pubspec.yaml
2 years ago