Commit Graph

312 Commits (772f6caa38e2ebdacbe4de6116a98bb7ab7cae30)

Author SHA1 Message Date
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
2 months ago
Sultan khan 2f4db29a70 arabic updated. 2 months ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 2 months ago
Sultan khan ac6e96ad6c no message 2 months ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
2 months ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 2 months ago
tahaalam fcf990bc00 hot fixes 2 months ago
Sultan khan cfea843c4f updates and fixes 2 months ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 2 months ago
Sultan khan a144f30f42 no message 2 months ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
2 months 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.
2 months ago
Sultan khan 3d226c39d0 fixes and updates 2 months 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
2 months ago
Sultan khan 5f82f0db2d fixes and updates 2 months ago
haroon amjad 86fa198afc Updates & fixes 2 months ago
haroon amjad 408c0c83d9 updates 2 months ago
Sultan khan 21ae30a8cc profile picture upload 2 months ago
Sultan khan 5f559a44dd profile image upload 2 months ago
haroon amjad 5b44329972 updates 2 months ago
haroon amjad f8df84177d update 2 months ago
haroon amjad 708cbb138d Updates
# Conflicts:
#	lib/presentation/radiology/radiology_result_page.dart
2 months ago
haroon amjad 572c37785b updates 2 months ago
haroon amjad e3f5bb69ac Updates 2 months 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
2 months 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.
2 months ago
haroon amjad 89a1da4407 Updates 2 months ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 2 months ago
haroon amjad 453cfc07e1 Updates 2 months ago
haroon amjad 1fa03fff5e updates 2 months ago
haroon amjad 21477f34dc updates 2 months ago
haroon amjad 0eb9ec11d3 remote localization files added 2 months ago
haroon amjad f929bd9017 Updates 2 months ago
haroon amjad 3d39190c62 updates & fixes 2 months ago
haroon amjad 04cbb3db40 no message 2 months 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
2 months ago
tahaalam 8a11cc03cb pickup direction bottom sheet added and previous radio bottom sheet removed 2 months ago
aamir-csol 5be4f66718 doctor ratings. 2 months ago
haroon amjad 3703afe8bd updates 2 months ago
haroon amjad edeae70aa0 Updates 2 months ago
haroon amjad 1f290c5bfe updates 2 months ago
haroon amjad deca29b423 updates & fixes 2 months ago
haroon amjad 93af246700 updates 2 months ago
haroon amjad bd65d05e9e Merge branch 'master' into haroon_dev 2 months ago
haroon amjad a13d0cf0e4 updates 2 months 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 months 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 months ago
haroon amjad 837a934d0d updates 2 months ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
2 months 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 months ago