Commit Graph

77 Commits (6a74cdd2da0aeea6130701aa0e6097ab0fc4e31e)

Author SHA1 Message Date
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
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
haroon amjad cb9ced27c2 updates 2 years ago
haroon amjad f8fb336740 Location checkin privilege applied 2 years ago
Sultan khan 432e64e51d updates 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
haroon amjad 7c426b90e5 updates 2 years ago
haroon amjad dd0099236d Insurance dialog added post registration 2 years ago
haroon amjad c7ee76d816 updates 2 years ago
devamirsaleemahmad b26f535749 models updates -> 3.13.6 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad da0a164b0e updates 3 years ago
haroon amjad f28fcbd006 AdvanceNumber_VP added 3 years ago
haroon amjad 63426a691d Ancillary orders family members issue resolved 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
haroon amjad 4f50c3ff8e Pharmacy LiveCare revamped 3 years ago
haroon amjad 74b0acefd3 Updates & fixes 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 22a0e456bc Manual Insurance Updates, Service ID fixes, Tamara Fixes 3 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad 442a94ac08 Updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 106334c9cf updates & fixes 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 3 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
haroon amjad 7018696328 E-Cens sign off 4 years ago
haroon amjad 4cbccd8efb analytics events update 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
haroon amjad f50bfda330 updates 4 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad d344169399 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookSuccess.dart
4 years ago
haroon amjad a918d409fb updates & fixes 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
Zohaib Iqbal Kambrani a398220033 no message 4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
haroon amjad f946a7be4d updates & fixes 4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago