Commit Graph

424 Commits (0ddaa6899da2debdff5cdf4f0ef1b13de88c6bda)

Author SHA1 Message Date
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
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
4 days ago
aamir-csol c11e859df1 search doctor by name filter. 4 days ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
4 days ago
faizatflutter 001808488c Added 'send report to email' feature 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
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
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
faizatflutter 8c91b6830a Triage Completed. Explain API left 1 week ago
haroon amjad 32ee47ca66 Merge branch 'master' into haroon_dev 2 weeks 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
2 weeks ago
haroon amjad b10d715d55 App updates 2 weeks ago
tahaalam f19d06512a filters changed in region selection bottom sheet 2 weeks ago
faizatflutter 49d091547a Till Triage Completed 2 weeks ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
2 weeks ago
haroon amjad 6f067d92d6 My invoices implemented 2 weeks ago
Sultan khan d62324044a default appointment load fix 2 weeks 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)
2 weeks ago
Sultan khan f7021f685a no message 2 weeks ago
faizatflutter 597579e677 refactoring 2 weeks ago
haroon amjad 93979707e4 Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad 213662e718 updates 2 weeks ago
faizatflutter 460e32d25a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
2 weeks ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 2 weeks 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
2 weeks ago
Sultan khan 0895d94df2 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 weeks ago
Sultan khan afe169d2d9 silent login fix 2 weeks ago
faizatflutter 40f6cafb48 fixed routing again and again. 2 weeks ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
2 weeks ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
2 weeks ago
faizatflutter 0e2de5a55d Completed Graph 2 weeks ago
haroon amjad 162337b317 Added appointment nearest gate & floor 2 weeks ago
Fatimah.Alshammari 11de01e079 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
2 weeks ago
faizatflutter d4dd475e0b Added Graph 2 weeks ago
Sultan khan d55fe5e527 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 weeks ago
Sultan khan 0e26505692 covid page inprogress 2 weeks ago
aamir-csol 6c1707128b Merge branch 'master' into dev_aamir 2 weeks ago
aamir-csol 3601e39a29 Health calculators & converters 2 weeks ago
faizatflutter 333046951c Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/routes/app_routes.dart
2 weeks ago
Sultan khan 6ceee6973f 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:
  sickleave fix
  Health calculators & converters
  updates
  updates
  updates
  updates
  Nearest Appointment selected

# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
2 weeks ago
Sultan khan 873b2a1591 sorting done, covid inprogress 2 weeks ago
faizatflutter a1aaa041d1 Water Intake Final Touches 3 weeks ago
haroon amjad b353de3cf8 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_doctor_page.dart
#	lib/presentation/book_appointment/widgets/doctor_card.dart
3 weeks ago