Commit Graph

627 Commits (bb4719bd8747b27cd6f663b6ed842e41ef8bceda)

Author SHA1 Message Date
aamir-csol bb4719bd87 logout & family file fix & PMA-1047 9 months ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
9 months ago
aamir-csol 8b701255ed logout & family file fix 9 months ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 9 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 9 months ago
haroon amjad f54ce71177 translation changes 9 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 9 months ago
haroon amjad 6faca94b89 updates 9 months ago
haroon amjad 99282f34e3 Added language change option in landing page 9 months ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
9 months ago
faizatflutter 4ceca016bb Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
9 months ago
faizatflutter 3bdc4e246f refactor 9 months ago
haroon amjad 9ef70a250d translation updates 9 months ago
haroon amjad 5feacfaf27 Translation updates 9 months ago
haroon amjad 39af08ddc3 Translation updates 9 months ago
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 3ff9628cd3 Translation updates 9 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
9 months ago
aamir-csol 0017c0601b blood donation changes 9 months ago
Sultan khan 7d8537fae6 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan 1edeff439e notifications page updates 9 months ago
haroon amjad 3e6ee8c10c Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/routes/app_routes.dart
9 months ago
haroon amjad 87422e8e05 translation updates 9 months ago
Fatimah.Alshammari 9795276ef9 fixed errors 9 months ago
haroon amjad 96ccb40f36 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 169215fd7b translation changes 9 months ago
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
9 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
9 months ago
Sultan khan 8c92df8648 contact us page fix 9 months ago
aamir-csol a816afadea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
9 months ago
aamir-csol d76ff5828f fixes 9 months ago
haroon amjad 8f428297cb Arabic translations added 9 months ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 9 months ago
Fatimah.Alshammari 1d224702ac Merge branch 'refs/heads/master' into fatima 9 months ago
Fatimah.Alshammari 69666a6f6c fixed button 9 months ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 9 months ago
Haroon6138 06c67a0409 Merge pull request 'dev_aamir' (#153) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/153
9 months ago
Sultan khan 0ddaa6899d 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:
  fixed parking qr
  added parking part
  added monthly report
  added monthly report
  added monthly report
  fix error
  monthly report
  fix toggle
  fix toggle
  active medication
  active medication
  active medication
10 months ago
Sultan khan 42222804fd fix graph dot and bp graph. 10 months ago
aamir-csol bf210e664d Merge branch 'master' into dev_aamir 10 months ago
aamir-csol 6725ab028d doctor search filter design update & switch user bug fix. 10 months ago
haroon amjad 609ae6ab83 updates 10 months ago
haroon amjad 344adf23c0 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
10 months ago
haroon amjad 44ce353dac updates 10 months ago
Fatimah.Alshammari 250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
10 months ago
haroon amjad fc750174fe Merge branch 'master' into haroon_dev 10 months ago
Haroon6138 aee496b7c3 Merge pull request 'dev_sultan' (#151) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/151
10 months ago
Sultan khan 16da0f4d0a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
Sultan khan 0c68ca4438 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:
  Added 'send report to email' feature
  Completed the health Tracker Module, Only the email part is left.
  only explain api left.
  Triage Completed. Explain API left
  Till Triage Completed
  refactoring

# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
10 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
10 months ago