Commit Graph

694 Commits (8b701255ed02bb3e0d64b09533b62af45fa4fc81)

Author SHA1 Message Date
aamir-csol 8b701255ed logout & family file fix 2 days ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
5 days ago
haroon amjad 5feacfaf27 Translation updates 6 days ago
haroon amjad 39af08ddc3 Translation updates 1 week ago
haroon amjad e5f24b9c06 updates 1 week ago
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 1 week ago
haroon amjad 3ff9628cd3 Translation updates 1 week 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
1 week ago
aamir-csol 0017c0601b blood donation changes 1 week ago
Sultan khan 7d8537fae6 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 week ago
Sultan khan 1edeff439e notifications page updates 1 week ago
haroon amjad 3e6ee8c10c Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/routes/app_routes.dart
1 week ago
haroon amjad 87422e8e05 translation updates 1 week ago
Fatimah.Alshammari 9795276ef9 fixed errors 1 week ago
haroon amjad 96ccb40f36 Merge branch 'master' into haroon_dev 1 week ago
haroon amjad 169215fd7b translation changes 1 week ago
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
1 week ago
Fatimah.Alshammari 287e2b9562 fixed QR 1 week 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
1 week ago
Sultan khan 8c92df8648 contact us page fix 1 week ago
aamir-csol a816afadea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
1 week ago
aamir-csol d76ff5828f fixes 1 week ago
haroon amjad 8f428297cb Arabic translations added 2 weeks ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 2 weeks ago
Fatimah.Alshammari 1d224702ac Merge branch 'refs/heads/master' into fatima 2 weeks ago
Fatimah.Alshammari 69666a6f6c fixed button 2 weeks ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 2 weeks 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
2 weeks 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
2 weeks ago
Sultan khan 42222804fd fix graph dot and bp graph. 2 weeks ago
aamir-csol bf210e664d Merge branch 'master' into dev_aamir 2 weeks ago
aamir-csol 6725ab028d doctor search filter design update & switch user bug fix. 2 weeks ago
haroon amjad 609ae6ab83 updates 2 weeks 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
2 weeks ago
haroon amjad 44ce353dac updates 2 weeks 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
2 weeks ago
haroon amjad fc750174fe Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad d848291930 updates 2 weeks 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
2 weeks ago
Sultan khan 16da0f4d0a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 weeks ago
Sultan khan 8ee0e3b4ea no message 2 weeks 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
2 weeks ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
2 weeks ago
Haroon6138 96ebc3c7e9 Merge pull request 'dev_aamir' (#149) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/149
2 weeks ago
Sultan khan 0514716910 no message 2 weeks ago
Sultan khan e903f9c418 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:
  search filter on select doctor page.
  family file fix
  blood group
2 weeks ago
Sultan khan ac0d72b3ff vital sign finalized. 2 weeks ago
aamir-csol c11e859df1 search doctor by name filter. 2 weeks ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
2 weeks ago
faizatflutter 001808488c Added 'send report to email' feature 2 weeks ago