Commit Graph

439 Commits (e5f24b9c06addc9b10dfe6a8819df1dc99b103bf)

Author SHA1 Message Date
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 3ff9628cd3 Translation updates 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
haroon amjad 87422e8e05 translation updates 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
haroon amjad a0008c9104 Nearest Appointment sorting fixed 9 months ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 9 months ago
aamir-csol bf210e664d Merge branch 'master' into dev_aamir 9 months ago
aamir-csol 6725ab028d doctor search filter design update & switch user bug fix. 9 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
9 months ago
haroon amjad 44ce353dac updates 9 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
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
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
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
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
9 months ago
Fatimah.Alshammari 8ae81d2b24 fixed parking qr 9 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
9 months ago
haroon amjad ede8844f19 Monthly Reports implemented 9 months ago
faizatflutter 17f32e34d3 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/presentation/symptoms_checker/user_info_selection.dart
9 months ago
faizatflutter 8c91b6830a Triage Completed. Explain API left 9 months ago
haroon amjad 32ee47ca66 Merge branch 'master' into haroon_dev 9 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
9 months ago
haroon amjad b10d715d55 App updates 9 months ago
tahaalam f19d06512a filters changed in region selection bottom sheet 9 months ago
faizatflutter 49d091547a Till Triage Completed 9 months ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
haroon amjad 6f067d92d6 My invoices implemented 9 months ago
Sultan khan d62324044a default appointment load fix 9 months ago
Sultan khan dc8031bb41 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:
  updates
  fixed the suggested design changes. (Not reminder ones)
  fixed the suggested design changes. (Not reminder ones)
10 months ago
Sultan khan f7021f685a no message 10 months ago
faizatflutter 597579e677 refactoring 10 months ago
haroon amjad 93979707e4 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 213662e718 updates 10 months ago
faizatflutter 460e32d25a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
10 months ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 10 months ago
Haroon6138 06f6cb1514 Merge pull request 'dev_sultan' (#137) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/137
10 months ago
Sultan khan 0895d94df2 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
Sultan khan afe169d2d9 silent login fix 10 months ago
faizatflutter 40f6cafb48 fixed routing again and again. 10 months ago