Commit Graph

337 Commits (b51cd52fa4a04b47169018d8b22643c6d0b0da4c)

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
1 day ago
Sultan khan 256537cfb3 update and fix 1 day ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 1 day ago
tahaalam ee8257054e Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/en-US.json
1 day ago
tahaalam 6b4d43caf3 referral hardcoded string changes 1 day ago
tahaalam 28d03644ba Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
1 day ago
Sultan khan fee2001499 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
1 day ago
Sultan khan 929a25d9a4 no message 1 day ago
aamir-csol 1515fc57e5 Localization 1 day ago
tahaalam bf9b88e79c map prescriptiojn changes
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
1 day ago
tahaalam 66e23197c5 referral lingual change 2 days ago
Sultan khan bd581c4fe0 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
2 days ago
Sultan khan 82f2adfc3f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 days ago
Sultan khan c1c434789e Rad Description & Ai Description 2 days ago
tahaalam a31c4c99df Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_kesy.g.dart
2 days ago
tahaalam 2d36d91ab6 language and stepper changes 2 days 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
tahaalam 50a597b4d3 lang changes 2 days ago
tahaalam 14771b32d3 reminder changes 2 days ago
tahaalam 5a4e5e138b string localization changes 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
tahaalam 994bf95043 updates and fixes 3 days ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
3 days ago
Sultan khan a2c2b24b2a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  health calculator design & timer & bell icon switch changes
  health calculator design & timer & bell icon switch changes
  appointment reminder & weather
  codegen
3 days ago
Sultan khan 2f4db29a70 arabic updated. 3 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 3 days ago
Sultan khan ac6e96ad6c no message 3 days ago
tahaalam 04d14a4d82 langauge regarding changes 3 days ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
4 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 5 days ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
5 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.
5 days ago
Sultan khan 3d226c39d0 fixes and updates 5 days ago
Sultan khan 7e2c470767 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Updates & fixes
6 days ago
Sultan khan 5f82f0db2d fixes and updates 6 days ago
haroon amjad 86fa198afc Updates & fixes 6 days ago
haroon amjad 408c0c83d9 updates 1 week ago
Sultan khan 21ae30a8cc profile picture upload 1 week ago
Sultan khan 5f559a44dd profile image upload 1 week ago
haroon amjad 5b44329972 updates 1 week ago
haroon amjad f8df84177d update 1 week ago
haroon amjad 708cbb138d Updates
# Conflicts:
#	lib/presentation/radiology/radiology_result_page.dart
1 week ago
haroon amjad 572c37785b updates 1 week ago
haroon amjad e3f5bb69ac Updates 1 week ago
haroon amjad 081dfce480 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
#	lib/widgets/input_widget.dart
1 week ago