Commit Graph

147 Commits (master)

Author SHA1 Message Date
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
57 minutes ago
Sultan khan 82f2adfc3f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 hour ago
Sultan khan c1c434789e Rad Description & Ai Description 1 hour 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
1 hour ago
tahaalam 2d36d91ab6 language and stepper changes 1 hour ago
aamir-csol 01e56e4fb5 Merge branch 'refs/heads/master' into dev_aamir 2 hours ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 2 hours ago
tahaalam 50a597b4d3 lang changes 3 hours ago
tahaalam 5a4e5e138b string localization changes 6 hours 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
1 day ago
tahaalam 994bf95043 updates and fixes 1 day ago
Sultan khan 772f6caa38 updates 1 day ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
1 day ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 1 day ago
tahaalam 04d14a4d82 langauge regarding changes 1 day ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 2 days ago
tahaalam fcf990bc00 hot fixes 2 days ago
Sultan khan cfea843c4f updates and fixes 2 days ago
Sultan khan a144f30f42 no message 2 days ago
Sultan khan 3d226c39d0 fixes and updates 3 days ago
Sultan khan 5f82f0db2d fixes and updates 4 days ago
haroon amjad 408c0c83d9 updates 5 days ago
Sultan khan 21ae30a8cc profile picture upload 5 days ago
Sultan khan 5f559a44dd profile image upload 5 days ago
haroon amjad 5b44329972 updates 5 days ago
haroon amjad 708cbb138d Updates
# Conflicts:
#	lib/presentation/radiology/radiology_result_page.dart
6 days ago
haroon amjad 572c37785b updates 6 days 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
Sultan khan 0d4563542a WD:map issues resolved:
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
1 week ago
haroon amjad 89a1da4407 Updates 1 week ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 1 week ago
haroon amjad 453cfc07e1 Updates 1 week ago
haroon amjad 1fa03fff5e updates 1 week ago
haroon amjad 0eb9ec11d3 remote localization files added 1 week ago
haroon amjad f929bd9017 Updates 1 week ago
tahaalam a2fa661db4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
1 week ago
tahaalam 8a11cc03cb pickup direction bottom sheet added and previous radio bottom sheet removed 1 week ago
aamir-csol 5be4f66718 doctor ratings. 1 week ago
haroon amjad 3703afe8bd updates 1 week ago
haroon amjad edeae70aa0 Updates 1 week ago
haroon amjad 1f290c5bfe updates 1 week ago
haroon amjad deca29b423 updates & fixes 2 weeks ago
haroon amjad 93af246700 updates 2 weeks ago
haroon amjad bd65d05e9e Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad a13d0cf0e4 updates 2 weeks ago
Sultan khan c970a3f697 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
  family file switch back issue fixed
  Vital sign updates
  updates
  Updates
  Added location option in region selection bottom sheet
  Updates
  Profile settings update
2 weeks ago
Sultan khan 6178062ed0 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: (33 commits)
  reminder start time added to the prescription
  Invoices Filter
  Updates
  updates
  Revert "graph values fix and comparision with the pdf"
  graph values fix and comparision with the pdf
  graph values fix and comparision with the pdf
  Updates
  Updates
  updates
  Updates
  Updates
  Updates
  Updates
  Habib Wallet updates
  Changes for AI Lab analysis
  App update page updates
  updates
  Updates
  warning dialog displayed to user if the watch intented is not currently implemented
  ...

# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 weeks ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad 78a6d55b35 Merge branch 'master' into watch_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 weeks ago