Commit Graph

484 Commits (b91850d38878a90605562fd3f7b41fa8fb543509)

Author SHA1 Message Date
Sultan khan b91850d388 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: (67 commits)
  added women support in symptoms checker module.
  family fil fixes
  PMA-1100
  updates
  updates
  Updates & fixes
  updates
  Ai Analysis & PMA-(1078,1079)
  update
  updates
  arabic fixes
  arabic fixes
  Vital sign data connected to Symptom checker
  Date format changed to en-US
  confirm button added
  iOS BundleID changes
  Services price list implemented
  Indoor navigation implemented
  updates & fixes
  JIRA bug fixes & updates
  ...

# Conflicts:
#	lib/presentation/authentication/register_step2.dart
#	lib/presentation/vital_sign/vital_sign_page.dart
4 weeks ago
Sultan khan c416d84a3a register insurance in progress. 4 weeks ago
faizatflutter afae41c410 Merge branch 'master' into faiz_dev 4 weeks ago
faizatflutter b44ae1e838 added women support in symptoms checker module. 4 weeks ago
aamir-csol 7296bfb6fc family fil fixes 1 month ago
aamir-csol c48cb78cd9 PMA-1100 1 month ago
haroon amjad 01c21377aa Updates & fixes 1 month ago
aamir-csol a105d87241 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
1 month ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 1 month ago
haroon amjad 95b65ed8a5 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
# Conflicts:
#	lib/features/book_appointments/book_appointments_view_model.dart
1 month ago
haroon amjad c9279e2272 updates 1 month ago
Haroon Amjad a4573c8710 arabic fixes 1 month ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 1 month ago
Haroon Amjad eeaa22357f Date format changed to en-US 1 month ago
haroon amjad 000c403f6b confirm button added 1 month ago
haroon amjad 3c9c3032a5 Services price list implemented 1 month ago
haroon amjad 2ab3e178a2 Indoor navigation implemented 1 month ago
haroon amjad 9ed016ad8b updates & fixes 1 month ago
haroon amjad 3af43dc676 JIRA bug fixes & updates 1 month ago
haroon amjad 66ff6ed8b6 Prescription download changes 1 month ago
haroon amjad 85ccf41d04 Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare 1 month ago
haroon amjad b309342cdc lab fixes 1 month ago
haroon amjad 5c684a6a0d Doctor Rating details implemented 1 month ago
haroon amjad bafe835ebd Scheduled livecare appointment booking fixes 1 month ago
aamir-csol 7014ac397e Merge remote-tracking branch 'origin/master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
1 month ago
aamir-csol 8c7f4afe76 family file button fix 2 months ago
haroon amjad 4e6d3d3178 SmartWatch implementation contd. 2 months ago
haroon amjad b0708d85d9 updates & fixes 2 months ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 2 months ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
2 months ago
aamir-csol 8b701255ed logout & family file fix 2 months ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 2 months ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 2 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 2 months ago
haroon amjad d2deb974b1 symptoms merge 2 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 2 months ago
haroon amjad f54ce71177 translation changes 2 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 2 months ago
haroon amjad 6faca94b89 updates 2 months ago
haroon amjad 99282f34e3 Added language change option in landing page 2 months ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
2 months ago
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 3ff9628cd3 Translation updates 2 months ago
aamir-csol bb72c7f7d6 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
2 months ago
aamir-csol 0017c0601b blood donation changes 2 months ago
Sultan khan 7d8537fae6 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 months ago
haroon amjad 87422e8e05 translation updates 2 months ago
Sultan khan 8b5c4d7575 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
2 months ago
Sultan khan 8c92df8648 contact us page fix 2 months ago
aamir-csol a816afadea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
2 months ago