Commit Graph

289 Commits (e3f5bb69accf1bdbd6f88645c68254f989d4a53c)

Author SHA1 Message Date
haroon amjad e3f5bb69ac Updates 1 day 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 day 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 day ago
haroon amjad 89a1da4407 Updates 1 day ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 1 day ago
haroon amjad 453cfc07e1 Updates 2 days ago
haroon amjad 1fa03fff5e updates 2 days ago
haroon amjad 21477f34dc updates 2 days ago
haroon amjad 0eb9ec11d3 remote localization files added 2 days ago
haroon amjad f929bd9017 Updates 3 days ago
haroon amjad 3d39190c62 updates & fixes 3 days ago
haroon amjad 04cbb3db40 no message 3 days 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
3 days ago
tahaalam 8a11cc03cb pickup direction bottom sheet added and previous radio bottom sheet removed 3 days ago
aamir-csol 5be4f66718 doctor ratings. 3 days ago
haroon amjad 3703afe8bd updates 4 days ago
haroon amjad edeae70aa0 Updates 4 days ago
haroon amjad 1f290c5bfe updates 4 days ago
haroon amjad deca29b423 updates & fixes 5 days ago
haroon amjad 93af246700 updates 5 days ago
haroon amjad bd65d05e9e Merge branch 'master' into haroon_dev 6 days ago
haroon amjad a13d0cf0e4 updates 6 days 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
6 days 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
6 days ago
haroon amjad 837a934d0d updates 1 week ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
1 week 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
1 week ago
haroon amjad 841fca027c updates 1 week ago
haroon amjad 078b236b67 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
1 week ago
haroon amjad e29aba81da Updates 1 week ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 1 week ago
tahaalam 8b829b9101 reminder start time added to the prescription 1 week ago
haroon amjad a45980162d Added location option in region selection bottom sheet 1 week ago
haroon amjad 444e7b562f Merge branch 'master' into haroon_dev 1 week ago
haroon amjad 7611c1d58c Updates 1 week ago
aamir-csol f1555c76a3 Invoices Filter 1 week ago
haroon amjad 1709b80e84 Updates 1 week ago
haroon amjad 4a3d66f01a Updates 1 week ago
haroon amjad d053f58b7d Updates 2 weeks ago
haroon amjad d703c382e5 Updates 2 weeks ago
haroon amjad 3d877ed28d Updates 2 weeks ago
Haroon Amjad 55b8bc162c Updates 3 weeks ago
haroon amjad 08928ddd28 Habib Wallet updates 3 weeks ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
3 weeks ago
haroon amjad 1a68ffd500 Updates 4 weeks ago
tahaalam 50d78551c2 warning dialog displayed to user if the watch intented is not currently implemented 4 weeks ago
haroon amjad abbf016694 Merge branch 'master' into haroon_dev 4 weeks ago
haroon amjad 2c0d010bac updates 4 weeks ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 4 weeks ago
Sultan khan f51e37db55 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
  updates
  lab test description update

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/presentation/authentication/login.dart
4 weeks ago