Commit Graph

591 Commits (cb2e3c7574a2363e471b2a5159a828f3e6cdb283)

Author SHA1 Message Date
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
12 hours ago
Sultan khan 256537cfb3 update and fix 12 hours ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 12 hours ago
tahaalam bf9b88e79c map prescriptiojn changes
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
18 hours ago
Sultan khan 82f2adfc3f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 day ago
aamir-csol 01e56e4fb5 Merge branch 'refs/heads/master' into dev_aamir 2 days ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 2 days ago
Sultan khan 6bc80a394d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 days ago
tahaalam 14771b32d3 reminder changes 2 days ago
Sultan khan c2d468bd74 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 days ago
Sultan khan 9ff303d514 fixes and updates. 2 days ago
tahaalam aa22ad1e07 calender request changes 2 days ago
aamir-csol 4c56137f10 calender 2 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
3 days ago
Sultan khan 69310575e5 updates 3 days ago
haroon amjad 4f60227429 LiveCare Video Call fixes 3 days ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
3 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
3 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 3 days ago
tahaalam 04d14a4d82 langauge regarding changes 3 days ago
Sultan khan 16e898bb6c updates and fixes 3 days ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
3 days ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 4 days ago
tahaalam fcf990bc00 hot fixes 4 days ago
Sultan khan cfea843c4f updates and fixes 4 days ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 4 days ago
Sultan khan a144f30f42 no message 4 days ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
4 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.
4 days ago
haroon amjad 86fa198afc Updates & fixes 6 days ago
haroon amjad 408c0c83d9 updates 7 days ago
Sultan khan fcdc96d944 no message 7 days ago
Sultan khan 21ae30a8cc profile picture upload 7 days ago
Sultan khan 5f559a44dd profile image upload 7 days ago
haroon amjad a0d9c35d0a Merge branch 'master' into haroon_dev 7 days ago
haroon amjad 5b44329972 updates 7 days ago
aamir-csol 7a0caa05c3 Merge branch 'master' into dev_aamir 7 days ago
aamir-csol d1e0ec31e6 radiology ai lab analysis & lab ai analysis api end points updates. 7 days ago
haroon amjad b33a559305 Dental workflow implemented 1 week ago
Sultan khan 3d1c415e2c my invoice updated 1 week ago
haroon amjad a2de3f1b14 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
1 week ago
aamir-csol 10fa8c46cf radiology ai lab analysis & lab ai analysis api end points updates. 1 week ago
haroon amjad 572c37785b updates 1 week ago
haroon amjad 13a4c9e0f8 updates 1 week ago
haroon amjad e3f5bb69ac Updates 1 week ago
haroon amjad 92101d2b05 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
1 week ago
haroon amjad 89a1da4407 Updates 1 week ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 1 week ago
aamir-csol be6d33e51b family switch parent child and child 2 1 week ago
aamir-csol e9ec23f506 family switch parent child and child 2 1 week ago