Commit Graph

606 Commits (246d414fe16a700749eebee4db45b688ab73b27d)

Author SHA1 Message Date
Sultan khan 246d414fe1 updates and fixes 17 hours ago
Sultan khan d9b6e9fed8 fixes and updates 20 hours ago
haroon amjad 333f702f80 updates & fixes 2 days ago
Sultan khan ab7ca36d5d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/en-US.json
2 days ago
Sultan khan 25cc485830 landing navigation item changed from feed back to health calculator and triage page provided 2 days ago
aamir-csol 458819398d Localization & rad error fix 2 days ago
tahaalam b93e23a314 Emergency servicews pages changes of passing the values which are displayed outside 3 days ago
tahaalam fb64d3b957 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
3 days ago
tahaalam e73d2534cc social media elements added for profile and service page 3 days ago
Sultan khan 83a414796a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
3 days ago
faizatflutter 10db964fd8 Merge branch 'master' into faiz_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
3 days ago
faizatflutter 61f17a3feb fixed api localization issue 3 days ago
Sultan khan b18ddd1ad7 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/generated/locale_keys.g.dart
3 days ago
Sultan khan 8a41b5716f updates 3 days ago
tahaalam 05aaa71cf9 live care changes 3 days ago
Sultan khan 6c3808effe Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/blood_donation/widgets/select_gender_widget.dart
#	lib/presentation/comprehensive_checkup/comprehensive_checkup_page.dart
3 days ago
Sultan khan 256537cfb3 update and fix 3 days ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 3 days ago
tahaalam bf9b88e79c map prescriptiojn changes
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
4 days ago
Sultan khan 82f2adfc3f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 4 days ago
aamir-csol 01e56e4fb5 Merge branch 'refs/heads/master' into dev_aamir 4 days ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 4 days ago
Sultan khan 6bc80a394d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 5 days ago
tahaalam 14771b32d3 reminder changes 5 days ago
Sultan khan c2d468bd74 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 5 days ago
Sultan khan 9ff303d514 fixes and updates. 5 days ago
tahaalam aa22ad1e07 calender request changes 5 days ago
aamir-csol 4c56137f10 calender 5 days ago
Sultan khan a38a2a0619 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/codegen_loader.g.dart
5 days ago
Sultan khan 69310575e5 updates 5 days ago
haroon amjad 4f60227429 LiveCare Video Call fixes 5 days ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
6 days ago
aamir-csol f0b8db0318 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
6 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 6 days ago
tahaalam 04d14a4d82 langauge regarding changes 6 days ago
Sultan khan 16e898bb6c updates and fixes 6 days ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
6 days ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 7 days ago
tahaalam fcf990bc00 hot fixes 7 days ago
Sultan khan cfea843c4f updates and fixes 7 days ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 7 days ago
Sultan khan a144f30f42 no message 7 days ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
7 days ago
tahaalam fb93aa1092 ambulance call page changes:
1. icon change for the success of ambulance call and rrt.
2. flow changed to first select the appoiintment then hospital.
3. location accorate enabled.
7 days ago
haroon amjad 86fa198afc Updates & fixes 1 week ago
haroon amjad 408c0c83d9 updates 1 week ago
Sultan khan fcdc96d944 no message 1 week ago
Sultan khan 21ae30a8cc profile picture upload 1 week ago
Sultan khan 5f559a44dd profile image upload 1 week ago
haroon amjad a0d9c35d0a Merge branch 'master' into haroon_dev 1 week ago