Commit Graph

1019 Commits (afd7c5db815f6c8ef2cd64e145674c47e97408a2)

Author SHA1 Message Date
haroon amjad 6b70461e27 biometric icon & text update 5 months ago
haroon amjad f265c605ca Merge branch 'merge-update-with-lab-changes' into update-to-3.32-sdk
# Conflicts:
#	android/app/local.properties
#	android/app/src/main/AndroidManifest.xml
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	ios/Podfile
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	ios/Runner/Info.plist
#	ios/Runner/Runner.entitlements
#	lib/config/localized_values.dart
#	lib/core/model/labs/LabOrderResult.dart
#	lib/core/model/labs/lab_result.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/new_ui/exception_widget/ExceptionBottomSheet.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/forgot-password.dart
#	lib/pages/login/register_new.dart
#	lib/pages/login/saved_login.dart
#	lib/pages/login/welcome.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/uitl/app_toast.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/pickupLocation/PickupLocationFromMap.dart
#	pubspec.yaml
5 months ago
haroon amjad 7b6395cc49 Merge branch 'dev_v3.13.6_CR_7211_Lab_report_changes' into merge-update-with-lab-changes
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
6 months ago
Sultan khan e689826730 login fixes 6 months ago
Aamir Muhammad 24a4020f5c fixes 6 months ago
Aamir Muhammad c3b8ec6067 fixes 6 months ago
Aamir Muhammad e64d1088a6 changes 6 months ago
Aamir Muhammad a7e310226e Exception Widget & Fixes 6 months ago
haroon amjad 8c8665a2f0 updates 6 months ago
Aamir Muhammad 2e01429221 Exception Widget & Fixes 6 months ago
haroon amjad 68410d908b updates & fixes for Huawei 6 months ago
haroon amjad 1ce35936e2 Updates 6 months ago
Aamir Muhammad f04928c3e8 fixes for login & register (Points) 6 months ago
Aamir Muhammad ee4ae657b0 fixes 6 months ago
Sultan khan ef8532b1c5 updated login flow 6 months ago
Aamir Muhammad e306bfd69b saved login fixes & design changes. 6 months ago
Aamir Muhammad 23fc89b40a font changes 6 months ago
Aamir Muhammad 6b96b6fc9e ui fixes 6 months ago
Aamir Muhammad 9704ef232f caleder changes 6 months ago
Sultan khan 890ff874e3 registration updated. 6 months ago
Aamir Muhammad a05cea7c8b registration fixes 6 months ago
Aamir Muhammad 2dd823667c register Design. 6 months ago
Sultan khan 007f17369b savedlogin 6 months ago
Sultan khan 5b45855cf6 saved login created 6 months ago
Aamir Muhammad 16b37b847d translation & register Design changes. 6 months ago
Aamir Muhammad 2d5b4342a1 tweaks 6 months ago
Aamir Muhammad 801a2578ab lottie & bottom sheet 6 months ago
Aamir Muhammad 90eea4d0d7 consumer on welcome & language & font 6 months ago
Aamir Muhammad dbfa3c7cee consumer on welcome & language & font 6 months ago
Aamir Muhammad a7f53d3b3c updated app to latest flutter sdk. 6 months ago
Syed Taha Alam 656d8dd6b4 Wd: Full portrait graph added. 6 months ago
haroon amjad e748712954 Initial Commit 6 months ago
Sultan khan 8881e9c0c7 login fixes 6 months ago
Syed Taha Alam c09170b506 Wd: Lab result graph completed. 6 months ago
Aamir Muhammad 2346195844 fixes 6 months ago
Aamir Muhammad 297eef9558 fixes 6 months ago
Aamir Muhammad c666ba219c changes 6 months ago
Syed Taha Alam 5461d78a1b Wd: graph added with the threshold 6 months ago
Aamir Muhammad 4d4e7e5a5b Exception Widget & Fixes 6 months ago
Aamir Muhammad e6ed6329ea Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk 6 months ago
Aamir Muhammad 5dfa9bafb9 Exception Widget & Fixes 6 months ago
haroon amjad 3f5ba0cfcd updates 6 months ago
Aamir Muhammad ec0e51c96c fixes for login & register (Points) 6 months ago
Aamir Muhammad 8028617398 Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk 6 months ago
Aamir Muhammad bdaef7f89c fixes for login & register (Points) 6 months ago
haroon amjad 90ec43f8b0 Updates 6 months ago
Aamir Muhammad fd0635764d fixes 6 months ago
Sultan khan dd97a27494 updated login flow 6 months ago
Aamir Muhammad da32bd8df1 saved login fixes & design changes. 6 months ago
Aamir Muhammad 54d17d2c16 font changes 6 months ago