Commit Graph

15 Commits (ff12e832ab7f6de7bc7ffafa2e1f05b06e32036a)

Author SHA1 Message Date
taha.alam 9047ebf723 Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_CR_7211_Lab_report_changes
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/build.gradle
#	android/gradle.properties
#	android/settings.gradle
#	lib/config/localized_values.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	pubspec.yaml
11 months ago
taha.alam 3d27fbdea8 WD: lab report changes 12 months ago
taha.alam 4bfaf0a0d8 WD: vital sign camera screen added 1 year ago
Aamir 0f0b541563 Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 1 year ago
haroon amjad 6386da8936 Mapbox key updated to custom maps 1 year ago
Aamir da3e266989 local 1 year ago
haroon amjad 53015422e5 PenguinIn integration with HMG App 1 year ago
haroon amjad 5b7b40c732 Updates & fixes 2 years ago
Aamir Muhammad e914925181 Calender Permission 2 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 4 years ago
Mohammad Aljammal a2e5b48915 fix merge issues 5 years ago
Mohammad Aljammal 1ce55e687f Ambulance Service second step 5 years ago
Sultan Khan 5d112b5464 merge 5 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 6 years ago