Commit Graph

20 Commits (f52aed49fd124e185ffdfd58bb9bc4d37b52bc31)

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 3f1ba19c64 changes & Null to Dynamic 2 years ago
Sultan khan 6a6ac76973 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 2 years ago
Sultan khan aa605a2e47 file updated 2 years ago
haroon amjad 0e054429ef Meal Plan implementation completed 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
haroon amjad 22a0e456bc Manual Insurance Updates, Service ID fixes, Tamara Fixes 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
hussam al-habibeh 6b1c0e04d0 pharmacy design home page 4 years ago
haroon amjad e7f5fc8434 Blood donation fixes 4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 43a672cc68 Updates & fixes 4 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
haroon amjad 587210ee58 UI fixes 4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 5 years ago