aamir-csol
|
0017c0601b
|
blood donation changes
|
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 |
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
|
9 months ago |
|
haroon amjad
|
609ae6ab83
|
updates
|
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
|
d848291930
|
updates
|
9 months ago |
|
Sultan khan
|
8ee0e3b4ea
|
no message
|
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 |
faizatflutter
|
ff2bcbae3f
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
|
9 months ago |
|
haroon amjad
|
91c16f13d1
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
9 months ago |
|
haroon amjad
|
1c0842ab95
|
updates
|
9 months ago |
|
faizatflutter
|
3f5bd0a759
|
Completed the health Tracker Module, Only the email part is left.
|
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 |
|
haroon amjad
|
685eec6a52
|
updates & fixes
|
9 months ago |
 tahaalam
|
699ef2f672
|
Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
# android/settings.gradle.kts
|
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 |
|
haroon amjad
|
255353dd21
|
Bottom nav updates
|
9 months ago |
|
faizatflutter
|
8c91b6830a
|
Triage Completed. Explain API left
|
9 months ago |
|
haroon amjad
|
e9dd2f0648
|
updates
|
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
|
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 |
|
haroon amjad
|
213662e718
|
updates
|
10 months ago |
|
Sultan khan
|
449c693fdb
|
Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
# lib/presentation/book_appointment/laser/laser_appointment.dart
|
10 months ago |
|
faizatflutter
|
f8fdd7570e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
10 months ago |
|
haroon amjad
|
162337b317
|
Added appointment nearest gate & floor
|
10 months 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
|
10 months ago |
|
Fatimah.Alshammari
|
62bb667cb8
|
added parking part
|
10 months ago |
|
faizatflutter
|
d4dd475e0b
|
Added Graph
|
10 months ago |
|
Sultan khan
|
0e26505692
|
covid page inprogress
|
10 months 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
|
10 months 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
|
10 months ago |
|
Sultan khan
|
873b2a1591
|
sorting done, covid inprogress
|
10 months ago |
|
faizatflutter
|
a1aaa041d1
|
Water Intake Final Touches
|
10 months ago |
|
aamir-csol
|
54f8391066
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
10 months ago |