Commit Graph

45 Commits (eefdb1fa3ec2ec1194b2ed92a263ebf691fd366d)

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
haroon amjad 1ecb8ebfe9 updated to stores version 11.3 2 years ago
Sultan khan ec13edc28b updates. 2 years ago
devamirsaleemahmad 23b7d85911 changes 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 2 years ago
haroon amjad 906fd5fd6a Inpatient services in dev 3 years ago
haroon amjad fcf0c589a0 Updates & fixes 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
haroon amjad f6191d9bf7 updates & fixes 3 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad a918d409fb updates & fixes 4 years ago
haroon amjad 32edb2e71e updates 4 years ago
haroon amjad 927db41068 Covid updates & other fixes 4 years ago
haroon amjad ac5077e9e7 Translation fixes 4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
Mirza.Shafique 1a6802ce24 Child Vaccine 3 4 years ago
Mirza.Shafique a766c2522e Child Vaccine 1.0 4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
Mirza.Shafique 06c5ee269b Bug Fixes 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
haroon amjad 0fe4a21388 updates & fixes 4 years ago
Mirza.Shafique 831780555c CMC 1.0 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
Mirza.Shafique f577905dcb eye measurment new design 4 years ago
Mirza.Shafique 0a83cf8241 Bug Fixis 4 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 4 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 4 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 4 years ago
Mirza.Shafique 876463c945 Home Page Font weight 5 years ago
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 5 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 5 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 5 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago
Mirza.Shafique d37f225c1b Home page 1.2 5 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 5 years ago