Commit Graph

772 Commits (44ce353dac9cde87772ff3c668ae2bde43c0c6fd)
 

Author SHA1 Message Date
haroon amjad 44ce353dac updates 9 months ago
haroon amjad fc750174fe Merge branch 'master' into haroon_dev 9 months ago
haroon amjad d848291930 updates 9 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
9 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
9 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
9 months 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
9 months ago
Haroon6138 2240c6cc65 Merge pull request 'Health Trackers Feature (faiz_dev)' (#150) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/150
9 months ago
Sultan khan 0514716910 no message 9 months 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
9 months ago
Sultan khan ac0d72b3ff vital sign finalized. 9 months ago
aamir-csol f62c7c9b20 Merge branch 'master' into dev_aamir 9 months ago
aamir-csol c11e859df1 search doctor by name filter. 9 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
9 months ago
faizatflutter 001808488c Added 'send report to email' feature 9 months ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
9 months ago
Haroon6138 a0b07d4b5a Merge pull request 'dev_aamir' (#147) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/147
9 months ago
haroon amjad 1c0842ab95 updates 9 months ago
aamir-csol 83f04bc0e6 search filter on select doctor page. 9 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 9 months ago
aamir-csol 38d8341963 family file fix 9 months ago
aamir-csol c7e4018ddc Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
9 months ago
aamir-csol b815affe5c blood group 9 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 9 months ago
Sultan khan 34e8386ca1 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan cc255e9c9a vital sign detail page 10 months ago
Haroon6138 7c82295e2c Merge pull request 'haroon_dev' (#144) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/144
10 months ago
haroon amjad 1656ca58c1 Merge branch 'ambulance_service' into haroon_dev 10 months ago
haroon amjad 685eec6a52 updates & fixes 10 months ago
haroon amjad d6b1744176 updates 10 months ago
tahaalam 699ef2f672 Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
#	android/settings.gradle.kts
10 months 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
10 months ago
Haroon6138 a2fde1ddeb Merge pull request 'haroon_dev' (#143) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/143
10 months ago
haroon amjad ede8844f19 Monthly Reports implemented 10 months ago
faizatflutter 17f32e34d3 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/presentation/symptoms_checker/user_info_selection.dart
10 months ago
haroon amjad 255353dd21 Bottom nav updates 10 months ago
faizatflutter 4ee0d1d3c8 only explain api left. 10 months ago
faizatflutter 8c91b6830a Triage Completed. Explain API left 10 months ago
haroon amjad c10ce10f10 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad e9dd2f0648 updates 10 months ago
Haroon6138 853a866567 Merge pull request 'haroon_dev' (#142) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/142
10 months ago
haroon amjad 210da3404c updates 10 months ago
haroon amjad 32ee47ca66 Merge branch 'master' into haroon_dev 10 months ago
Haroon6138 ba211ea4c2 Merge pull request 'hospital_filter' (#141) from hospital_filter into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/141
10 months ago
haroon amjad b10d715d55 App updates 10 months ago
tahaalam f19d06512a filters changed in region selection bottom sheet 10 months ago
faizatflutter 49d091547a Till Triage Completed 10 months ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
10 months ago
Haroon6138 b7a32c7453 Merge pull request 'dev_sultan' (#140) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/140
10 months ago
haroon amjad 6f067d92d6 My invoices implemented 10 months ago