Commit Graph

673 Commits (97a47ce4e8ef11bf7da6f6bfde3c374122efdb4e)

Author SHA1 Message Date
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
2 days ago
Fatimah.Alshammari 287e2b9562 fixed QR 2 days ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 2 days ago
Fatimah.Alshammari 1d224702ac Merge branch 'refs/heads/master' into fatima 2 days ago
Fatimah.Alshammari 69666a6f6c fixed button 2 days ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 3 days 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
3 days 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
3 days ago
Sultan khan 42222804fd fix graph dot and bp graph. 3 days ago
aamir-csol bf210e664d Merge branch 'master' into dev_aamir 3 days ago
aamir-csol 6725ab028d doctor search filter design update & switch user bug fix. 3 days ago
haroon amjad 609ae6ab83 updates 3 days 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
3 days ago
haroon amjad 44ce353dac updates 3 days 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
3 days ago
haroon amjad fc750174fe Merge branch 'master' into haroon_dev 3 days ago
haroon amjad d848291930 updates 3 days 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
3 days ago
Sultan khan 16da0f4d0a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 3 days ago
Sultan khan 8ee0e3b4ea no message 3 days 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
3 days ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
3 days 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
3 days ago
Sultan khan 0514716910 no message 3 days 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
3 days ago
Sultan khan ac0d72b3ff vital sign finalized. 3 days ago
aamir-csol c11e859df1 search doctor by name filter. 3 days ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
3 days ago
faizatflutter 001808488c Added 'send report to email' feature 4 days ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
4 days ago
haroon amjad 1c0842ab95 updates 4 days ago
aamir-csol 83f04bc0e6 search filter on select doctor page. 4 days ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 4 days ago
aamir-csol 38d8341963 family file fix 4 days ago
aamir-csol c7e4018ddc Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
5 days ago
aamir-csol b815affe5c blood group 5 days ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 1 week ago
Fatimah.Alshammari 20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
1 week ago
Fatimah.Alshammari 8ae81d2b24 fixed parking qr 1 week ago
Sultan khan 34e8386ca1 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 week ago
Sultan khan cc255e9c9a vital sign detail page 1 week ago
haroon amjad 1656ca58c1 Merge branch 'ambulance_service' into haroon_dev 1 week ago
haroon amjad 685eec6a52 updates & fixes 1 week ago
haroon amjad d6b1744176 updates 1 week ago
tahaalam 699ef2f672 Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
#	android/settings.gradle.kts
1 week ago
tahaalam 85f9609cbb Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
#	android/app/libs/PenNavUI.aar
#	android/app/libs/Penguin.aar
#	android/app/libs/PenguinRenderer.aar
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
#	android/build/reports/problems/problems-report.html
#	ios/Runner/AppDelegate.swift
1 week ago
haroon amjad ede8844f19 Monthly Reports implemented 1 week ago
faizatflutter 17f32e34d3 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/presentation/symptoms_checker/user_info_selection.dart
1 week ago
haroon amjad 255353dd21 Bottom nav updates 1 week ago
faizatflutter 4ee0d1d3c8 only explain api left. 1 week ago